axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r524188 [3/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...
Date Fri, 30 Mar 2007 17:26:54 GMT
Modified: webservices/axis2/trunk/c/axiom/include/axiom_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_util.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_util.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_util.h Fri Mar 30 10:26:22 2007
@@ -31,14 +31,14 @@
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_first_child_element_with_uri(
         axiom_node_t *ele_node,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *uri,
         axiom_node_t **child);
 
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_next_sibling_element_with_uri(
         axiom_node_t *ele_node,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *uri,
         axiom_node_t **next_node);
 
@@ -47,28 +47,28 @@
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_first_child_element(
         axiom_element_t *ele,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_node_t *ele_node,
         axiom_node_t **child_node);
 
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_last_child_element(
         axiom_element_t *ele,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_node_t *ele_node,
         axiom_node_t **child_node);
 
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_next_sibling_element(
         axiom_element_t *ele,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_node_t *ele_node,
         axiom_node_t **next_node);
 
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_first_child_element_with_localname(
         axiom_element_t *ele,
-        const axis2_env_t  *env,
+        const axutil_env_t  *env,
         axiom_node_t *ele_node,
         axis2_char_t *localname,
         axiom_node_t **child_node);
@@ -77,7 +77,7 @@
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_last_child_element_with_localname(
         axiom_element_t *ele,
-        const axis2_env_t  *env,
+        const axutil_env_t  *env,
         axiom_node_t *ele_node,
         axis2_char_t *localname,
         axiom_node_t **child_node);
@@ -85,7 +85,7 @@
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_next_siblng_element_with_localname(
         axiom_element_t *ele,
-        const axis2_env_t  *env,
+        const axutil_env_t  *env,
         axiom_node_t *ele_node,
         axis2_char_t *localname,
         axiom_node_t **next_node);
@@ -93,14 +93,14 @@
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_first_child_element_with_uri_localname(
         axiom_element_t *ele,
-        const axis2_env_t  *env,
+        const axutil_env_t  *env,
         axiom_node_t *ele_node,
         axis2_char_t *localname,
         axis2_char_t *uri,
         axiom_node_t **child_node);
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_last_child_element_with_uri_localname(axiom_element_t *ele,
-            const axis2_env_t  *env,
+            const axutil_env_t  *env,
             axiom_node_t *ele_node,
             axis2_char_t *localname,
             axis2_char_t *uri,
@@ -108,7 +108,7 @@
 
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_next_sibling_element_with_uri_localname(axiom_element_t *ele,
-            const axis2_env_t  *env,
+            const axutil_env_t  *env,
             axiom_node_t *ele_node,
             axis2_char_t *localname,
             axis2_char_t *uri,
@@ -116,7 +116,7 @@
 
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_first_child_element_with_localnames(axiom_element_t *ele,
-            const axis2_env_t  *env,
+            const axutil_env_t  *env,
             axiom_node_t *ele_node,
             axutil_array_list_t *names,
             axiom_node_t **child_node);
@@ -124,21 +124,21 @@
 
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_last_child_element_with_localnames(axiom_element_t *ele,
-            const axis2_env_t  *env,
+            const axutil_env_t  *env,
             axiom_node_t *ele_node,
             axutil_array_list_t *names,
             axiom_node_t **child_node);
 
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_next_siblng_element_with_localnames(axiom_element_t *ele,
-            const axis2_env_t  *env,
+            const axutil_env_t  *env,
             axiom_node_t *ele_node,
             axutil_array_list_t *names,
             axiom_node_t **next_node);
 
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_first_child_element_with_localname_attr(axiom_element_t *ele,
-            const axis2_env_t  *env,
+            const axutil_env_t  *env,
             axiom_node_t *ele_node,
             axis2_char_t *localname,
             axis2_char_t *attr_name,
@@ -148,7 +148,7 @@
 
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_last_child_element_with_localname_attr(axiom_element_t *ele,
-            const axis2_env_t  *env,
+            const axutil_env_t  *env,
             axiom_node_t *ele_node,
             axis2_char_t *localname,
             axis2_char_t *attr_name,
@@ -157,7 +157,7 @@
 
     AXIS2_EXTERN axiom_element_t * AXIS2_CALL
     axiom_util_get_next_siblng_element_with_localname_attr(axiom_element_t *ele,
-            const axis2_env_t  *env,
+            const axutil_env_t  *env,
             axiom_node_t *ele_node,
             axis2_char_t *localname,
             axis2_char_t *attr_name,
@@ -166,25 +166,25 @@
 
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     axiom_util_get_child_text(axiom_node_t *node,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     axiom_util_get_localname(axiom_node_t *node,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     axiom_util_get_node_namespace_uri(axiom_node_t *om_node,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
 
     AXIS2_EXTERN axiom_child_element_iterator_t* AXIS2_CALL
     axiom_util_get_child_elements(axiom_element_t *om_ele,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axiom_node_t *om_node);
 
     AXIS2_EXTERN axiom_document_t* AXIS2_CALL
     axiom_util_new_document(
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_uri_t *uri);
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h Fri Mar 30 10:26:22 2007
@@ -23,7 +23,7 @@
  *@brief this is the parser abstraction layer for axis2
  */
 
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_utils.h>
 
 #ifdef __cplusplus
@@ -73,35 +73,35 @@
          * causes the reader to read the next parse event. 
          * returns the event just read
          * @param parser axiom_xml_reader struct 
-         * @param env    axis2_environment, MUST NOT be NULL
+         * @param env    axutil_environment, MUST NOT be NULL
          * @returns one of the events defined in 
          *          axiom_xml_reader_event_types
          */
 
         int(AXIS2_CALL *
             next)(axiom_xml_reader_t *parser,
-                const axis2_env_t *env);
+                const axutil_env_t *env);
 
         /**
         * free pull_parser
         * @param parser axiom_xml_reader struct 
-        * @param env    axis2_environment MUST NOT be NULL 
+        * @param env    axutil_environment MUST NOT be NULL 
         * @returns axis2_status_code
         */
 
         void (AXIS2_CALL *
         free)(axiom_xml_reader_t *parser,
-                const axis2_env_t *env);
+                const axutil_env_t *env);
         /**
          * Get the Number of attributes in the current element 
          * @param parser axiom_xml_reader  
-         * @param env    axis2_environment, MUST NOT be NULL.
+         * @param env    axutil_environment, MUST NOT be NULL.
          * @returns Number of attributes , AXIS2_FAILURE on error 
          */
 
         int(AXIS2_CALL *
             get_attribute_count)(axiom_xml_reader_t *parser,
-                const axis2_env_t *env);
+                const axutil_env_t *env);
 
 
         /** This is used to get an attribute's localname using an index relative to
@@ -115,7 +115,7 @@
           */
         axis2_char_t*(AXIS2_CALL *
             get_attribute_name_by_number)(axiom_xml_reader_t *parser,
-                const axis2_env_t *env,
+                const axutil_env_t *env,
                 int i);
 
         /** This is used to get an attribute's prefix using an index relative to
@@ -130,7 +130,7 @@
 
         axis2_char_t*(AXIS2_CALL *
             get_attribute_prefix_by_number)(axiom_xml_reader_t *parser,
-                const axis2_env_t *env,
+                const axutil_env_t *env,
                 int i);
 
         /** Gets an attribute's value using an index relative to
@@ -145,7 +145,7 @@
 
         axis2_char_t*(AXIS2_CALL *
             get_attribute_value_by_number)(axiom_xml_reader_t *parser,
-                 const axis2_env_t *env,
+                 const axutil_env_t *env,
                  int i);
 
         /** Gets an attribute's namespace uri using an index relative to
@@ -160,7 +160,7 @@
 
         axis2_char_t*(AXIS2_CALL *
             get_attribute_namespace_by_number)(axiom_xml_reader_t *parser,
-                 const axis2_env_t *env,
+                 const axutil_env_t *env,
                  int i);
 
         /** Returns the text value of current element
@@ -171,7 +171,7 @@
           */
         axis2_char_t*(AXIS2_CALL *
             get_value)(axiom_xml_reader_t *parser,
-                 const axis2_env_t *env);
+                 const axutil_env_t *env);
 
         /**
          * Returns the namespace count of current element 
@@ -181,7 +181,7 @@
          */
         int(AXIS2_CALL *
             get_namespace_count)(axiom_xml_reader_t *parser,
-                const axis2_env_t *env);
+                const axutil_env_t *env);
         /**
          * Accesses the namespace uri of the namespaces declared in current element 
          * using an index 
@@ -193,7 +193,7 @@
          */
         axis2_char_t*(AXIS2_CALL *
             get_namespace_uri_by_number)(axiom_xml_reader_t *parser,
-                 const axis2_env_t *env,
+                 const axutil_env_t *env,
                  int i);
         /**
          * Accesses the namespace prefix of the namespaces declared in current element 
@@ -206,7 +206,7 @@
          */
         axis2_char_t*(AXIS2_CALL *
             get_namespace_prefix_by_number)(axiom_xml_reader_t *parser,
-                 const axis2_env_t *env,
+                 const axutil_env_t *env,
                  int i);
 
         /**
@@ -218,7 +218,7 @@
          */
         axis2_char_t*(AXIS2_CALL *
             get_prefix)(axiom_xml_reader_t *parser,
-                 const axis2_env_t *env);
+                 const axutil_env_t *env);
 
         /**
          * Used to obtain the current element localname
@@ -229,7 +229,7 @@
          */
         axis2_char_t*(AXIS2_CALL *
             get_name)(axiom_xml_reader_t *parser,
-                 const axis2_env_t *env);
+                 const axutil_env_t *env);
 
         /**
          * Used to get the processingInstruction target
@@ -240,7 +240,7 @@
          */
         axis2_char_t*(AXIS2_CALL *
              get_pi_target)(axiom_xml_reader_t *parser,
-                  const axis2_env_t *env);
+                  const axutil_env_t *env);
 
         /**
          * Gets the processingInstruction data
@@ -251,7 +251,7 @@
          */
         axis2_char_t*(AXIS2_CALL *
             get_pi_data)(axiom_xml_reader_t *parser,
-                 const axis2_env_t *env);
+                 const axutil_env_t *env);
 
         /**
          * Used to get the DTD 
@@ -262,7 +262,7 @@
          */
         axis2_char_t*(AXIS2_CALL *
             get_dtd)(axiom_xml_reader_t *parser,
-                 const axis2_env_t *env);
+                 const axutil_env_t *env);
 
         /**
          *  Free function , this function wraps the underlying parser's 
@@ -276,7 +276,7 @@
          */
         void(AXIS2_CALL *
             xml_free)(axiom_xml_reader_t *parser,
-                 const axis2_env_t *env,
+                 const axutil_env_t *env,
                  void *data);
 
         /**
@@ -288,16 +288,16 @@
 
         axis2_char_t*(AXIS2_CALL *
             get_char_set_encoding)(axiom_xml_reader_t *parser,
-                 const axis2_env_t *env);
+                 const axutil_env_t *env);
 
         /** Returns the namespace uri associated with current node */
         axis2_char_t*(AXIS2_CALL *
             get_namespace_uri)(axiom_xml_reader_t *parser,
-                 const axis2_env_t *env);
+                 const axutil_env_t *env);
 
         axis2_char_t*(AXIS2_CALL *
             get_namespace_uri_by_prefix)(axiom_xml_reader_t *parser,
-                 const axis2_env_t *env,
+                 const axutil_env_t *env,
                  axis2_char_t *prefix);
     };
 
@@ -319,7 +319,7 @@
      * NULL on error with error code set in the environment's error
      */
     AXIS2_EXTERN axiom_xml_reader_t *AXIS2_CALL
-    axiom_xml_reader_create_for_file(const axis2_env_t *env,
+    axiom_xml_reader_create_for_file(const axutil_env_t *env,
         char *filename,
         const axis2_char_t *encoding);
 
@@ -339,7 +339,7 @@
      * @param encoding encoding scheme of the xml stream
      */
     AXIS2_EXTERN axiom_xml_reader_t *AXIS2_CALL
-    axiom_xml_reader_create_for_io(const axis2_env_t *env,
+    axiom_xml_reader_create_for_io(const axutil_env_t *env,
         AXIS2_READ_INPUT_CALLBACK,
         AXIS2_CLOSE_INPUT_CALLBACK,
         void *ctx,
@@ -354,7 +354,7 @@
      * @return pointer to axiom_xml_reader_t struct on success , NULL otherwise
      */
     AXIS2_EXTERN axiom_xml_reader_t *AXIS2_CALL
-    axiom_xml_reader_create_for_memory(const axis2_env_t *env,
+    axiom_xml_reader_create_for_memory(const axutil_env_t *env,
         void *container,
         int size,
         const axis2_char_t *encoding,

Modified: webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h Fri Mar 30 10:26:22 2007
@@ -23,7 +23,7 @@
  *@brief this is the parser abstraction layer for axis2
  */
 
-#include <axis2_env.h>
+#include <axutil_env.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -58,7 +58,7 @@
 
         void (AXIS2_CALL *
         free)(axiom_xml_writer_t *writer,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
         /**
          *  Write a start tag to output stream with localname.
          *  Internally the writer keeps track of the opened tags 
@@ -70,7 +70,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_start_element)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *localname);
         /**
          *  write an end tag to the output relying on the internal
@@ -83,7 +83,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 end_start_element)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env);
+                        const axutil_env_t *env);
         /**
          * Write an element tag with localname and namespace uri 
          * @param writer pointer to xml writer struct
@@ -96,7 +96,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_start_element_with_namespace)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *localname,
                         axis2_char_t *namespace_uri);
 
@@ -112,7 +112,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_start_element_with_namespace_prefix)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *localname,
                         axis2_char_t *namespace_uri,
                         axis2_char_t *prefix);
@@ -126,7 +126,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_empty_element)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *localname);
         /**
          * write empty_element with localname and namespace uri.
@@ -140,7 +140,7 @@
 
         axis2_status_t(AXIS2_CALL *
                 write_empty_element_with_namespace)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *localname,
                         axis2_char_t *namespace_uri);
         /**
@@ -155,7 +155,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_empty_element_with_namespace_prefix)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *localname,
                         axis2_char_t *namespace_uri,
                         axis2_char_t *prefix);
@@ -168,7 +168,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_end_element)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env);
+                        const axutil_env_t *env);
         /**
          * write end document
          * @param writer xml writer
@@ -178,7 +178,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_end_document)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env);
+                        const axutil_env_t *env);
         /**
          * write attribute with localname and value
          * @param writer writer
@@ -190,7 +190,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_attribute)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *localname,
                         axis2_char_t *value);
         /**
@@ -204,7 +204,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_attribute_with_namespace)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *localname,
                         axis2_char_t *value,
                         axis2_char_t *namespace_uri);
@@ -218,7 +218,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_attribute_with_namespace_prefix)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *localname,
                         axis2_char_t *value,
                         axis2_char_t *namespace_uri,
@@ -234,7 +234,7 @@
 
         axis2_status_t(AXIS2_CALL *
                 write_namespace)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *prefix,
                         axis2_char_t *namespace_uri);
         /**
@@ -247,7 +247,7 @@
 
         axis2_status_t(AXIS2_CALL *
                 write_default_namespace)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *namespace_uri);
         /**
          * @param writer xml_writer
@@ -260,7 +260,7 @@
 
         axis2_status_t(AXIS2_CALL *
                 write_comment)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *value);
         /**
          * @param writer xml_writer
@@ -273,7 +273,7 @@
 
         axis2_status_t(AXIS2_CALL *
                 write_processing_instruction)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *target);
 
         /**
@@ -287,7 +287,7 @@
 
         axis2_status_t(AXIS2_CALL *
                 write_processing_instruction_data)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *target,
                         axis2_char_t *data);
 
@@ -300,7 +300,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_cdata)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *data);
 
 
@@ -313,7 +313,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_dtd)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *dtd);
 
 
@@ -326,7 +326,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_entity_ref)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *name);
 
         /**
@@ -337,7 +337,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_start_document)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env);
+                        const axutil_env_t *env);
 
 
         /**
@@ -349,7 +349,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_start_document_with_version)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *version);
 
         /**
@@ -362,7 +362,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_start_document_with_version_encoding)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *version,
                         axis2_char_t *encoding);
 
@@ -375,7 +375,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_characters)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *text);
 
         /**
@@ -387,7 +387,7 @@
          */
         axis2_char_t*(AXIS2_CALL *
                 get_prefix)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *uri);
 
         /**
@@ -400,7 +400,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 set_prefix)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *prefix,
                         axis2_char_t *uri);
 
@@ -413,7 +413,7 @@
          */
         axis2_status_t(AXIS2_CALL *
                 set_default_prefix)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *uri);
 
         /**
@@ -426,29 +426,29 @@
          */
         axis2_status_t(AXIS2_CALL *
                 write_encoded)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *text,
                         int in_attr);
 
         void*(AXIS2_CALL *
                 get_xml)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env);
+                        const axutil_env_t *env);
 
         axis2_status_t (AXIS2_CALL *
                 flush)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env);
+                        const axutil_env_t *env);
 
         unsigned int(AXIS2_CALL *
                 get_xml_size)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env);
+                        const axutil_env_t *env);
 
         int(AXIS2_CALL *
                 get_type)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env);
+                        const axutil_env_t *env);
 
         axis2_status_t(AXIS2_CALL *
                 write_raw)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env,
+                        const axutil_env_t *env,
                         axis2_char_t *content);
     };
 
@@ -467,14 +467,14 @@
      *
      */
     AXIS2_EXTERN axiom_xml_writer_t * AXIS2_CALL
-    axiom_xml_writer_create(const axis2_env_t *env,
+    axiom_xml_writer_create(const axutil_env_t *env,
             axis2_char_t *filename,
             axis2_char_t *encoding,
             int is_prefix_default,
             int compression);
 
     AXIS2_EXTERN axiom_xml_writer_t * AXIS2_CALL
-    axiom_xml_writer_create_for_memory(const axis2_env_t *env,
+    axiom_xml_writer_create_for_memory(const axutil_env_t *env,
             axis2_char_t *encoding,
             int is_prefix_default,
             int compression,

Modified: webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h Fri Mar 30 10:26:22 2007
@@ -26,7 +26,7 @@
 #include <axis2_utils.h>
 #include <axis2_error.h>
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axutil_allocator.h>
 #include <axis2_string.h>
 #include <axutil_array_list.h>
@@ -47,18 +47,18 @@
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_mime_body_part_add_header(axiom_mime_body_part_t *mime_body_part, 
-        const axis2_env_t *env, 
+        const axutil_env_t *env, 
         const axis2_char_t *name, 
         const axis2_char_t *value); 
    
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_mime_body_part_set_data_handler(axiom_mime_body_part_t *mime_body_part, 
-        const axis2_env_t *env, 
+        const axutil_env_t *env, 
         axiom_data_handler_t *data_handler); 
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_mime_body_part_write_to(axiom_mime_body_part_t *mime_body_part, 
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_byte_t **output_stream, 
         int *output_stream_size); 
 
@@ -67,13 +67,13 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_mime_body_part_free(axiom_mime_body_part_t *mime_body_part, 
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 /**
  * Creates mime_body_part struct
  * @return pointer to newly created mime_body_part
  */
 AXIS2_EXTERN axiom_mime_body_part_t * AXIS2_CALL 
-axiom_mime_body_part_create (const axis2_env_t *env);
+axiom_mime_body_part_create (const axutil_env_t *env);
 
 #define AXIOM_MIME_BODY_PART_FREE(mime_body_part, env) \
     axiom_mime_body_part_free (mime_body_part, env)

Modified: webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h Fri Mar 30 10:26:22 2007
@@ -26,7 +26,7 @@
 #include <axis2_utils.h>
 #include <axis2_error.h>
 #include <axis2_utils_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 @@
 
     AXIS2_EXTERN axis2_byte_t* AXIS2_CALL
     axiom_mime_output_complete(axiom_mime_output_t *mime_output,
-        const axis2_env_t *env, 
+        const axutil_env_t *env, 
         axis2_byte_t **output_stream,
         int *output_stream_size,
         axis2_char_t *soap_body_buffer,
@@ -62,7 +62,7 @@
 
     AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
     axiom_mime_output_get_content_type_for_mime(axiom_mime_output_t *mime_output, 
-        const axis2_env_t *env, 
+        const axutil_env_t *env, 
         axis2_char_t *boundary, 
         axis2_char_t *content_id, 
         axis2_char_t *char_set_encoding, 
@@ -73,14 +73,14 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_mime_output_free(axiom_mime_output_t *mime_output,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Creates mime_output struct
      * @return pointer to newly created mime_output
      */
     AXIS2_EXTERN axiom_mime_output_t * AXIS2_CALL 
-    axiom_mime_output_create (const axis2_env_t *env);
+    axiom_mime_output_create (const axutil_env_t *env);
 
 #define AXIOM_MIME_OUTPUT_FREE(mime_output, env) axiom_mime_output_free (mime_output, env)
 

Modified: webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c Fri Mar 30 10:26:22 2007
@@ -29,7 +29,7 @@
 };
 
 AXIS2_EXTERN axiom_data_handler_t * AXIS2_CALL
-axiom_data_handler_create(const axis2_env_t *env,
+axiom_data_handler_create(const axutil_env_t *env,
     const axis2_char_t *file_name,
     const axis2_char_t *mime_type)
 {
@@ -83,7 +83,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axiom_data_handler_free(axiom_data_handler_t *data_handler, 
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -112,14 +112,14 @@
 
 AXIS2_EXTERN axis2_char_t * AXIS2_CALL
 axiom_data_handler_get_content_type(axiom_data_handler_t *data_handler, 
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return data_handler->mime_type;
 }
 
 AXIS2_EXTERN axis2_byte_t * AXIS2_CALL
 axiom_data_handler_get_input_stream(axiom_data_handler_t *data_handler, 
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     /*@TODO implement the following*/
     return (axis2_byte_t *)"";
@@ -127,7 +127,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_data_handler_read_from(axiom_data_handler_t *data_handler, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_byte_t** output_stream, 
     int *output_stream_size)
 {
@@ -273,7 +273,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_data_handler_set_binary_data(axiom_data_handler_t *data_handler, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_byte_t* input_stream, int input_stream_len)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -286,7 +286,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_data_handler_write_to(axiom_data_handler_t *data_handler, 
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -321,7 +321,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_data_handler_set_file_name(axiom_data_handler_t *data_handler, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t* file_name)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c Fri Mar 30 10:26:22 2007
@@ -31,7 +31,7 @@
 
 
 AXIS2_EXTERN axiom_mime_body_part_t * AXIS2_CALL
-axiom_mime_body_part_create(const axis2_env_t *env)
+axiom_mime_body_part_create(const axutil_env_t *env)
 {
     axiom_mime_body_part_t *mime_body_part = NULL;
 
@@ -61,7 +61,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axiom_mime_body_part_free(axiom_mime_body_part_t *mime_body_part, 
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -96,7 +96,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_mime_body_part_add_header(axiom_mime_body_part_t *mime_body_part,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *name,
     const axis2_char_t *value)
 {
@@ -110,7 +110,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_mime_body_part_set_data_handler(axiom_mime_body_part_t *mime_body_part,
-    const axis2_env_t *env, axiom_data_handler_t *data_handler)
+    const axutil_env_t *env, axiom_data_handler_t *data_handler)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     mime_body_part->data_handler = data_handler;
@@ -119,7 +119,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_mime_body_part_write_to(axiom_mime_body_part_t *mime_body_part, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_byte_t **output_stream, int *output_stream_size)
 {
     axis2_hash_index_t *hash_index = NULL;

Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c Fri Mar 30 10:26:22 2007
@@ -31,18 +31,18 @@
 };
 
 static axis2_status_t 
-axis2_char_2_byte(const axis2_env_t *env, 
+axis2_char_2_byte(const axutil_env_t *env, 
     axis2_char_t *char_buffer, 
     axis2_byte_t **byte_buffer, 
     int *byte_buffer_size);
 
 static axiom_mime_body_part_t *
 axis2_create_mime_body_part(axiom_text_t *text, 
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 static axis2_status_t
 axis2_write_body_part(axiom_mime_output_t *mime_output, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_byte_t **output_stream, 
     int *output_stream_size,
     axiom_mime_body_part_t *part, 
@@ -50,27 +50,27 @@
 
 static axis2_status_t 
 axis2_write_mime_boundary(axiom_mime_output_t *mime_output, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_byte_t **output_stream, 
     int *output_stream_size,
     axis2_char_t *boundary);
 
 static axis2_status_t 
 axis2_write_finish_writing_mime(axiom_mime_output_t *mime_output, 
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_byte_t **output_stream, 
     int *output_stream_size, 
     axis2_char_t *boundary);
 
 static axis2_status_t 
 axis2_start_writing_mime(axiom_mime_output_t *mime_output,
-    const axis2_env_t *env, 
+    const axutil_env_t *env, 
     axis2_byte_t **output_stream,
     int *output_stream_size, 
     axis2_char_t *boundary);
 
 AXIS2_EXTERN axiom_mime_output_t * AXIS2_CALL
-axiom_mime_output_create(const axis2_env_t *env)
+axiom_mime_output_create(const axutil_env_t *env)
 {
     axiom_mime_output_t *mime_output = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -88,7 +88,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axiom_mime_output_free(axiom_mime_output_t *mime_output, 
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -103,7 +103,7 @@
 
 AXIS2_EXTERN axis2_byte_t * AXIS2_CALL
 axiom_mime_output_complete(axiom_mime_output_t *mime_output,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_byte_t **output_stream,
         int *output_stream_size,
         axis2_char_t *soap_body_buffer,
@@ -300,7 +300,7 @@
 
 static axis2_status_t 
 axis2_start_writing_mime(axiom_mime_output_t *mime_output,
-        const axis2_env_t *env, axis2_byte_t **output_stream,
+        const axutil_env_t *env, axis2_byte_t **output_stream,
         int *output_stream_size, axis2_char_t *boundary)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -308,7 +308,7 @@
 }
 
 static axis2_status_t 
-axis2_write_mime_boundary(axiom_mime_output_t *mime_output, const axis2_env_t *env,
+axis2_write_mime_boundary(axiom_mime_output_t *mime_output, const axutil_env_t *env,
         axis2_byte_t **output_stream, int *output_stream_size,
         axis2_char_t *boundary)
 {
@@ -346,7 +346,7 @@
 }
 
 static axiom_mime_body_part_t *
-axis2_create_mime_body_part(axiom_text_t *text, const axis2_env_t *env)
+axis2_create_mime_body_part(axiom_text_t *text, const axutil_env_t *env)
 {
     axiom_data_handler_t *data_handler = NULL;
     const axis2_char_t *content_type = "application/octet-stream";
@@ -380,7 +380,7 @@
 }
 
 static axis2_status_t 
-axis2_write_body_part(axiom_mime_output_t *mime_output, const axis2_env_t *env,
+axis2_write_body_part(axiom_mime_output_t *mime_output, const axutil_env_t *env,
         axis2_byte_t **output_stream, int *output_stream_size,
         axiom_mime_body_part_t *part, axis2_char_t *boundary)
 {
@@ -432,7 +432,7 @@
 }
 
 static axis2_status_t 
-axis2_write_finish_writing_mime(axiom_mime_output_t *mime_output, const axis2_env_t *env,
+axis2_write_finish_writing_mime(axiom_mime_output_t *mime_output, const axutil_env_t *env,
         axis2_byte_t **output_stream, int *output_stream_size, axis2_char_t *boundary)
 {
     axis2_byte_t *byte_buffer;
@@ -467,7 +467,7 @@
 
 AXIS2_EXTERN const axis2_char_t * AXIS2_CALL
 axiom_mime_output_get_content_type_for_mime(axiom_mime_output_t *mime_output,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *boundary,
         axis2_char_t *content_id,
         axis2_char_t *char_set_encoding,
@@ -544,7 +544,7 @@
 }
 
 static axis2_status_t
-axis2_char_2_byte(const axis2_env_t *env, 
+axis2_char_2_byte(const axutil_env_t *env, 
     axis2_char_t *char_buffer, 
     axis2_byte_t **byte_buffer, 
     int *byte_buffer_size)

Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c Fri Mar 30 10:26:22 2007
@@ -35,7 +35,7 @@
 #define AXIOM_MIME_PARSER_END_OF_MIME_MAX_COUNT 100
 
 AXIS2_EXTERN axiom_mime_parser_t * AXIS2_CALL
-axiom_mime_parser_create(const axis2_env_t *env)
+axiom_mime_parser_create(const axutil_env_t *env)
 {
     axiom_mime_parser_t *mime_parser = NULL;
 
@@ -65,7 +65,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axiom_mime_parser_free(axiom_mime_parser_t *mime_parser, 
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -83,7 +83,7 @@
 
 AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
 axiom_mime_parser_parse(axiom_mime_parser_t *mime_parser,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     AXIS2_READ_INPUT_CALLBACK callback,
     void *callback_ctx,
     axis2_char_t *mime_boundary)
@@ -464,21 +464,21 @@
 
 AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
 axiom_mime_parser_get_mime_parts_map(axiom_mime_parser_t *mime_parser,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return mime_parser->mime_parts_map;
 }
 
 AXIS2_EXTERN int AXIS2_CALL
 axiom_mime_parser_get_soap_body_len(axiom_mime_parser_t *mime_parser,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return mime_parser->soap_body_len;
 }
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axiom_mime_parser_get_soap_body_str(axiom_mime_parser_t *mime_parser,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return mime_parser->soap_body_str;
 }

Modified: webservices/axis2/trunk/c/axiom/src/om/axiom_namespace_internal.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/axiom_namespace_internal.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/axiom_namespace_internal.h (original)
+++ webservices/axis2/trunk/c/axiom/src/om/axiom_namespace_internal.h Fri Mar 30 10:26:22 2007
@@ -35,7 +35,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_namespace_set_uri(axiom_namespace_t *ns,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *ns_uri);
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/src/om/axiom_node_internal.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/axiom_node_internal.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/axiom_node_internal.h (original)
+++ webservices/axis2/trunk/c/axiom/src/om/axiom_node_internal.h Fri Mar 30 10:26:22 2007
@@ -51,7 +51,7 @@
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_set_parent (axiom_node_t * om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t * parent);
 
 /**
@@ -62,7 +62,7 @@
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_set_first_child(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *first_child);
 
 /**
@@ -75,7 +75,7 @@
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL  
 axiom_node_set_previous_sibling(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *prev_sibling); 
 
 /**
@@ -88,7 +88,7 @@
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_set_next_sibling(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *next_sibling);
 
 /**
@@ -101,7 +101,7 @@
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_node_set_node_type(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_types_t type);
 
 /**
@@ -114,7 +114,7 @@
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_node_set_data_element(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void* data_element);
 
 /**
@@ -126,7 +126,7 @@
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_set_complete(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t done);
 
 /**
@@ -135,7 +135,7 @@
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_set_document(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     struct axiom_document *om_doc);
 
 /**
@@ -143,12 +143,12 @@
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_set_builder(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     struct axiom_stax_builder *builder);
 
 AXIS2_EXTERN struct axiom_stax_builder *AXIS2_CALL
 axiom_node_get_builder(axiom_node_t *om_node,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 /** @} */
     

Modified: webservices/axis2/trunk/c/axiom/src/om/axiom_stax_builder_internal.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/axiom_stax_builder_internal.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/axiom_stax_builder_internal.h (original)
+++ webservices/axis2/trunk/c/axiom/src/om/axiom_stax_builder_internal.h Fri Mar 30 10:26:22 2007
@@ -41,24 +41,24 @@
     
 AXIS2_EXTERN int AXIS2_CALL
 axiom_stax_builder_get_current_event(axiom_stax_builder_t *builder,
-                                        const axis2_env_t *env);
+                                        const axutil_env_t *env);
                                         
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_stax_builder_set_lastnode(axiom_stax_builder_t *builder,
-                                    const axis2_env_t *env,
+                                    const axutil_env_t *env,
                                     axiom_node_t *om_node);
                                     
 AXIS2_EXTERN int AXIS2_CALL
 axiom_stax_builder_get_element_level(axiom_stax_builder_t* builder,
-                                        const axis2_env_t *env); 
+                                        const axutil_env_t *env); 
                                             
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_stax_builder_set_element_level(axiom_stax_builder_t* builder,
-                                        const axis2_env_t *env,
+                                        const axutil_env_t *env,
                                         int element_level);  
 AXIS2_EXTERN axiom_node_t* AXIS2_CALL
 axiom_stax_builder_get_lastnode(axiom_stax_builder_t *builder,
-                                   const axis2_env_t *env);
+                                   const axutil_env_t *env);
   
 /** @} */
     

Modified: webservices/axis2/trunk/c/axiom/src/om/om_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_attribute.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_attribute.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_attribute.c Fri Mar 30 10:26:22 2007
@@ -33,7 +33,7 @@
 };
 
 AXIS2_EXTERN axiom_attribute_t* AXIS2_CALL
-axiom_attribute_create(const axis2_env_t *env,
+axiom_attribute_create(const axutil_env_t *env,
     const axis2_char_t * localname,
     const axis2_char_t * value,
     axiom_namespace_t * ns)
@@ -85,7 +85,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axiom_attribute_free(axiom_attribute_t *attribute,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (--attribute->ref > 0)
     {
@@ -114,7 +114,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axiom_attribute_free_void_arg(void *attribute,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axiom_attribute_t *om_attribute_l = NULL;
 
@@ -126,7 +126,7 @@
 
 AXIS2_EXTERN axis2_qname_t *AXIS2_CALL
 axiom_attribute_get_qname(axiom_attribute_t *attribute,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_qname_t *qname = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -153,7 +153,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_attribute_serialize(axiom_attribute_t *attribute,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_output_t *om_output)
 {
     int status = AXIS2_SUCCESS;
@@ -195,7 +195,7 @@
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axiom_attribute_get_localname(axiom_attribute_t *attribute,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (attribute->localname)
     {
@@ -206,7 +206,7 @@
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axiom_attribute_get_value(axiom_attribute_t *attribute,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (attribute->value)
     {
@@ -217,7 +217,7 @@
 
 AXIS2_EXTERN axiom_namespace_t* AXIS2_CALL
 axiom_attribute_get_namespace(axiom_attribute_t *attribute,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return attribute->ns;
@@ -225,7 +225,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_attribute_set_localname(axiom_attribute_t *attribute,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *localname)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -250,7 +250,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_attribute_set_value(axiom_attribute_t *attribute,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *value)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -273,7 +273,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_attribute_set_namespace(axiom_attribute_t *attribute,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_namespace_t *om_namespace)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -284,7 +284,7 @@
 
 AXIS2_EXTERN axiom_attribute_t* AXIS2_CALL
 axiom_attribute_clone(axiom_attribute_t *attribute,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axiom_attribute_t *cloned_attr    = NULL;
     if (!attribute) return NULL;
@@ -304,7 +304,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_attribute_increment_ref(struct axiom_attribute *om_attribute,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     om_attribute->ref++;
@@ -312,7 +312,7 @@
 }
 
 AXIS2_EXTERN axiom_attribute_t* AXIS2_CALL
-axiom_attribute_create_str(const axis2_env_t *env,
+axiom_attribute_create_str(const axutil_env_t *env,
     axis2_string_t * localname,
     axis2_string_t * value,
     axiom_namespace_t * ns)
@@ -363,21 +363,21 @@
 
 AXIS2_EXTERN axis2_string_t* AXIS2_CALL
 axiom_attribute_get_localname_str(axiom_attribute_t *attribute,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return attribute->localname;
 }
 
 AXIS2_EXTERN axis2_string_t* AXIS2_CALL
 axiom_attribute_get_value_str(axiom_attribute_t *attribute,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return attribute->value;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_attribute_set_localname_str(axiom_attribute_t *attribute,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_string_t *localname)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -396,7 +396,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_attribute_set_value_str(axiom_attribute_t *attribute,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_string_t *value)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c Fri Mar 30 10:26:22 2007
@@ -26,7 +26,7 @@
 };
 
 AXIS2_EXTERN  axiom_child_element_iterator_t * AXIS2_CALL
-axiom_child_element_iterator_create(const axis2_env_t *env,
+axiom_child_element_iterator_create(const axutil_env_t *env,
         axiom_node_t *current_child)
 {
     axiom_child_element_iterator_t *iterator = NULL;
@@ -55,7 +55,7 @@
 AXIS2_EXTERN  void AXIS2_CALL
 axiom_child_element_iterator_free
 (void *iterator,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_FREE(env->allocator, iterator);
@@ -65,7 +65,7 @@
 AXIS2_EXTERN  axis2_status_t AXIS2_CALL
 axiom_child_element_iterator_remove
 (axiom_child_element_iterator_t *iterator,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     axiom_node_t *last_child = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -87,7 +87,7 @@
 AXIS2_EXTERN  axis2_bool_t AXIS2_CALL
 axiom_child_element_iterator_has_next
 (axiom_child_element_iterator_t *iterator,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -97,7 +97,7 @@
 AXIS2_EXTERN  axiom_node_t* AXIS2_CALL
 axiom_child_element_iterator_next
 (axiom_child_element_iterator_t *iterator,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 

Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_iterator.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_iterator.c Fri Mar 30 10:26:22 2007
@@ -27,7 +27,7 @@
 };
 
 AXIS2_EXTERN  axiom_children_iterator_t * AXIS2_CALL
-axiom_children_iterator_create(const axis2_env_t *env,
+axiom_children_iterator_create(const axutil_env_t *env,
     axiom_node_t *current_child)
 {
     axiom_children_iterator_t *iterator = NULL;
@@ -58,7 +58,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axiom_children_iterator_free(axiom_children_iterator_t *iterator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
 
@@ -68,7 +68,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_children_iterator_remove(axiom_children_iterator_t *iterator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axiom_node_t *om_node = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -103,7 +103,7 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axiom_children_iterator_has_next(axiom_children_iterator_t *iterator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -112,7 +112,7 @@
 
 AXIS2_EXTERN axiom_node_t *AXIS2_CALL
 axiom_children_iterator_next(axiom_children_iterator_t *iterator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -130,7 +130,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_children_iterator_reset(axiom_children_iterator_t *iterator,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 

Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c Fri Mar 30 10:26:22 2007
@@ -31,7 +31,7 @@
 };
 
 AXIS2_EXTERN axiom_children_qname_iterator_t *AXIS2_CALL
-axiom_children_qname_iterator_create(const axis2_env_t *env,
+axiom_children_qname_iterator_create(const axutil_env_t *env,
     axiom_node_t *current_child, axis2_qname_t *given_qname)
 {
     axiom_children_qname_iterator_t *iterator = NULL;
@@ -72,7 +72,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axiom_children_qname_iterator_free(axiom_children_qname_iterator_t *iterator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
 
@@ -86,7 +86,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_children_qname_iterator_remove(axiom_children_qname_iterator_t *iterator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axiom_node_t *last_child = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -117,7 +117,7 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axiom_children_qname_iterator_has_next(axiom_children_qname_iterator_t *iterator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
 
@@ -166,7 +166,7 @@
 
 AXIS2_EXTERN axiom_node_t *AXIS2_CALL
 axiom_children_qname_iterator_next(axiom_children_qname_iterator_t *iterator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 

Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c Fri Mar 30 10:26:22 2007
@@ -32,7 +32,7 @@
 
 AXIS2_EXTERN axiom_children_with_specific_attribute_iterator_t * AXIS2_CALL
 axiom_children_with_specific_attribute_iterator_create(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *current_child,
     axis2_qname_t *attr_qname,
     axis2_char_t *attr_value,
@@ -70,7 +70,7 @@
 AXIS2_EXTERN void AXIS2_CALL
 axiom_children_with_specific_attribute_iterator_free(
     axiom_children_with_specific_attribute_iterator_t *iterator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
     if (iterator->attr_qname)
@@ -84,7 +84,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_children_with_specific_attribute_iterator_remove(
     axiom_children_with_specific_attribute_iterator_t *iterator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axiom_node_t *last_child = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -117,7 +117,7 @@
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axiom_children_with_specific_attribute_iterator_has_next(
     axiom_children_with_specific_attribute_iterator_t *iterator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_bool_t matching_node_found = AXIS2_FALSE;
     axis2_bool_t need_to_move_forward = AXIS2_TRUE;
@@ -171,7 +171,7 @@
 AXIS2_EXTERN axiom_node_t* AXIS2_CALL
 axiom_children_with_specific_attribute_iterator_next(
     axiom_children_with_specific_attribute_iterator_t *iterator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axiom_node_t *last_child = NULL;
     AXIS2_ENV_CHECK(env, NULL);

Modified: webservices/axis2/trunk/c/axiom/src/om/om_comment.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_comment.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_comment.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_comment.c Fri Mar 30 10:26:22 2007
@@ -26,7 +26,7 @@
 };
 
 AXIS2_EXTERN axiom_comment_t *AXIS2_CALL
-axiom_comment_create(const axis2_env_t *env,
+axiom_comment_create(const axutil_env_t *env,
     axiom_node_t *parent,
     const axis2_char_t *value,
     axiom_node_t **node)
@@ -79,7 +79,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axiom_comment_free(axiom_comment_t *comment,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -93,7 +93,7 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axiom_comment_get_value(axiom_comment_t *comment,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return comment->value;
@@ -101,7 +101,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_comment_set_value(axiom_comment_t *comment,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *value)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -123,7 +123,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_comment_serialize(axiom_comment_t *comment,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_output_t *om_output)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/axiom/src/om/om_data_source.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_data_source.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_data_source.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_data_source.c Fri Mar 30 10:26:22 2007
@@ -35,7 +35,7 @@
 };
 
 AXIS2_EXTERN axiom_data_source_t *AXIS2_CALL
-axiom_data_source_create(const axis2_env_t *env,
+axiom_data_source_create(const axutil_env_t *env,
     axiom_node_t * parent,
     axiom_node_t **node)
 {
@@ -85,7 +85,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axiom_data_source_free(axiom_data_source_t * data_source,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
 
@@ -101,7 +101,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_data_source_serialize(axiom_data_source_t *data_source,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_output_t *om_output)
 {
     int status = AXIS2_SUCCESS;
@@ -125,7 +125,7 @@
 
 AXIS2_EXTERN axis2_stream_t *AXIS2_CALL
 axiom_data_source_get_stream(axiom_data_source_t *data_source,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return data_source->stream;

Modified: webservices/axis2/trunk/c/axiom/src/om/om_doctype.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_doctype.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_doctype.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_doctype.c Fri Mar 30 10:26:22 2007
@@ -26,7 +26,7 @@
 };
 
 AXIS2_EXTERN axiom_doctype_t *AXIS2_CALL
-axiom_doctype_create(const axis2_env_t *env,
+axiom_doctype_create(const axutil_env_t *env,
     axiom_node_t *parent,
     const axis2_char_t *value,
     axiom_node_t **node)
@@ -79,7 +79,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axiom_doctype_free(axiom_doctype_t *om_doctype,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (om_doctype)
     {
@@ -94,7 +94,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_doctype_set_value(axiom_doctype_t *om_doctype,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *value)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -105,7 +105,7 @@
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axiom_doctype_get_value(axiom_doctype_t *om_doctype,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return om_doctype->value;
@@ -113,7 +113,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_doctype_serialize(axiom_doctype_t *om_doctype,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_output_t *om_output)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/axiom/src/om/om_document.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_document.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_document.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_document.c Fri Mar 30 10:26:22 2007
@@ -39,7 +39,7 @@
 };
 
 AXIS2_EXTERN axiom_document_t *AXIS2_CALL
-axiom_document_create(const axis2_env_t *env,
+axiom_document_create(const axutil_env_t *env,
         axiom_node_t *root,
         axiom_stax_builder_t *builder)
 {
@@ -69,7 +69,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axiom_document_free(axiom_document_t *document,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
 
@@ -84,7 +84,7 @@
 
 AXIS2_EXTERN axiom_node_t *AXIS2_CALL
 axiom_document_build_next(axiom_document_t *document,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axiom_node_t  *last_child = NULL;
 
@@ -119,7 +119,7 @@
 
 AXIS2_EXTERN axiom_node_t *AXIS2_CALL
 axiom_document_get_root_element(axiom_document_t *document,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axiom_node_t *node = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -148,7 +148,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_document_set_root_element(axiom_document_t *document,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *node)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -169,7 +169,7 @@
 
 AXIS2_EXTERN axiom_node_t* AXIS2_CALL
 axiom_document_build_all(struct axiom_document *document,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     if (!document)
@@ -209,7 +209,7 @@
 
 AXIS2_EXTERN axiom_stax_builder_t* AXIS2_CALL
 axiom_document_get_builder(axiom_document_t *document,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return document->builder;
@@ -217,7 +217,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_document_serialize(axiom_document_t *document,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_output_t *om_output)
 {
     if (!document)

Modified: webservices/axis2/trunk/c/axiom/src/om/om_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_element.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_element.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_element.c Fri Mar 30 10:26:22 2007
@@ -50,7 +50,7 @@
 };
 
 AXIS2_EXTERN axiom_element_t *AXIS2_CALL
-axiom_element_create(const axis2_env_t *env,
+axiom_element_create(const axutil_env_t *env,
     axiom_node_t *parent,
     const axis2_char_t *localname,
     axiom_namespace_t *ns,
@@ -135,7 +135,7 @@
 }
 
 AXIS2_EXTERN axiom_element_t *AXIS2_CALL
-axiom_element_create_with_qname(const axis2_env_t *env,
+axiom_element_create_with_qname(const axutil_env_t *env,
     axiom_node_t *parent,
     const axis2_qname_t *qname,
     axiom_node_t ** node)
@@ -210,7 +210,7 @@
 
 AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
 axiom_element_find_namespace(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t * element_node,
     const axis2_char_t * uri,
     const axis2_char_t * prefix)
@@ -324,7 +324,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_declare_namespace_assume_param_ownership(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_namespace_t *ns)
 {
     axis2_char_t *prefix = NULL;
@@ -372,7 +372,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_declare_namespace(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *node,
     axiom_namespace_t *ns)
 {
@@ -434,7 +434,7 @@
 
 AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
 axiom_element_find_declared_namespace(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t * uri,
     const axis2_char_t * prefix)
 {
@@ -493,7 +493,7 @@
 
 AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
 axiom_element_find_namespace_with_qname(axiom_element_t *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *node,
     axis2_qname_t *qname)
 {
@@ -518,7 +518,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_add_attribute(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_attribute_t *attribute,
     axiom_node_t *element_node)
 {
@@ -573,7 +573,7 @@
 
 AXIS2_EXTERN axiom_attribute_t *AXIS2_CALL
 axiom_element_get_attribute(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *qname)
 {
     axis2_char_t *name = NULL;
@@ -593,7 +593,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axiom_element_free(axiom_element_t *om_element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if (!om_element)
@@ -669,7 +669,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_serialize_start_part(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_output_t *om_output,
     axiom_node_t *ele_node)
 {
@@ -753,7 +753,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_serialize_end_part(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_output_t * om_output)
 {
     int status = AXIS2_SUCCESS;
@@ -765,7 +765,7 @@
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axiom_element_get_localname(axiom_element_t *om_element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (om_element->localname)
         return (axis2_char_t *)axis2_string_get_buffer(om_element->localname, env);
@@ -775,7 +775,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_set_localname(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *localname)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -795,7 +795,7 @@
 
 AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
 axiom_element_get_namespace(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ele_node)
 
 {
@@ -818,7 +818,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_set_namespace(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_namespace_t *ns,
     axiom_node_t *node)
 {
@@ -847,7 +847,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_set_namespace_assume_param_ownership(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_namespace_t *ns)
 {
     om_element->ns = ns;
@@ -856,7 +856,7 @@
 
 AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
 axiom_element_get_all_attributes(axiom_element_t *om_element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
 
     return om_element->attributes;
@@ -864,14 +864,14 @@
 
 AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
 axiom_element_get_namespaces(axiom_element_t *om_element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return om_element->namespaces;
 }
 
 AXIS2_EXTERN axis2_qname_t *AXIS2_CALL
 axiom_element_get_qname(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ele_node)
 {
     axiom_namespace_t *ns =  NULL;
@@ -913,7 +913,7 @@
 
 AXIS2_EXTERN axiom_children_iterator_t *AXIS2_CALL
 axiom_element_get_children(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *element_node)
 {
     AXIS2_PARAM_CHECK(env->error, element_node, NULL);
@@ -932,7 +932,7 @@
 
 AXIS2_EXTERN axiom_children_qname_iterator_t *AXIS2_CALL
 axiom_element_get_children_with_qname(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *element_qname,
     axiom_node_t *element_node)
 {
@@ -950,7 +950,7 @@
 
 AXIS2_EXTERN axiom_element_t *AXIS2_CALL
 axiom_element_get_first_child_with_qname(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *element_qname,
     axiom_node_t *element_node,
     axiom_node_t **child_node)
@@ -993,7 +993,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_remove_attribute(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_attribute_t *om_attribute)
 {
     axis2_qname_t *qname = NULL;
@@ -1017,7 +1017,7 @@
 
 AXIS2_EXTERN axiom_element_t *AXIS2_CALL
 axiom_element_get_first_element(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *element_node,
     axiom_node_t **first_ele_node)
 {
@@ -1046,7 +1046,7 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axiom_element_get_text(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *element_node)
 {
     axis2_char_t *dest = NULL;
@@ -1109,7 +1109,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_set_text(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *text,
     axiom_node_t *element_node)
 {
@@ -1139,7 +1139,7 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axiom_element_to_string(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *element_node)
 {
     int status = AXIS2_SUCCESS;
@@ -1173,7 +1173,7 @@
 
 AXIS2_EXTERN axiom_child_element_iterator_t *AXIS2_CALL
 axiom_element_get_child_elements(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *element_node)
 {
     axiom_node_t *first_node = NULL;
@@ -1195,7 +1195,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_build(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *om_ele_node)
 {
     axiom_stax_builder_t *builder = NULL;
@@ -1227,7 +1227,7 @@
 
 AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
 axiom_element_get_default_namespace(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *element_node)
 {
     axiom_node_t *parent_node = NULL;
@@ -1266,7 +1266,7 @@
 */
 AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
 axiom_element_declare_default_namespace(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *uri)
 {
     axiom_namespace_t *default_ns = NULL;
@@ -1305,7 +1305,7 @@
 
 AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
 axiom_element_find_namespace_uri(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix,
     axiom_node_t *element_node)
 {
@@ -1343,7 +1343,7 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axiom_element_get_attribute_value(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *qname)
 {
     axis2_char_t *name = NULL;
@@ -1368,7 +1368,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_set_namespace_with_no_find_in_current_scope(
     axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_namespace_t  *om_ns)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1379,7 +1379,7 @@
 
 AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
 axiom_element_extract_attributes(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ele_node)
 {
     axis2_hash_index_t *hi = NULL;
@@ -1439,7 +1439,7 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axiom_element_get_attribute_value_by_name(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *attr_name)
 {
     axis2_hash_index_t *hi = NULL;
@@ -1503,7 +1503,7 @@
 }
 
 AXIS2_EXTERN axiom_element_t *AXIS2_CALL
-axiom_element_create_str(const axis2_env_t *env,
+axiom_element_create_str(const axutil_env_t *env,
     axiom_node_t *parent,
     axis2_string_t *localname,
     axiom_namespace_t *ns,
@@ -1589,14 +1589,14 @@
 
 AXIS2_EXTERN axis2_string_t* AXIS2_CALL
 axiom_element_get_localname_str(axiom_element_t *om_element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return om_element->localname;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_set_localname_str(axiom_element_t *om_element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_string_t *localname)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/axiom/src/om/om_namespace.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_namespace.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_namespace.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_namespace.c Fri Mar 30 10:26:22 2007
@@ -32,7 +32,7 @@
 };
 
 AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
-axiom_namespace_create(const axis2_env_t *env,
+axiom_namespace_create(const axutil_env_t *env,
     const axis2_char_t * uri,
     const axis2_char_t * prefix)
 {
@@ -82,7 +82,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axiom_namespace_free(axiom_namespace_t *om_namespace,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -113,7 +113,7 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axiom_namespace_equals(axiom_namespace_t *om_namespace,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_namespace_t *om_namespace1)
 {
     int uris_differ = 0;
@@ -154,7 +154,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_namespace_serialize(axiom_namespace_t *om_namespace,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_output_t *om_output)
 {
     int status = AXIS2_SUCCESS;
@@ -183,7 +183,7 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axiom_namespace_get_uri(axiom_namespace_t *om_namespace,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (om_namespace->uri)
     {
@@ -195,7 +195,7 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axiom_namespace_get_prefix(axiom_namespace_t *om_namespace,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (om_namespace->prefix)
     {
@@ -206,7 +206,7 @@
 
 AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
 axiom_namespace_clone(axiom_namespace_t *om_namespace,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axiom_namespace_t *cloned_ns    = NULL;
 
@@ -223,7 +223,7 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axiom_namespace_to_string(axiom_namespace_t *om_namespace,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axis2_char_t *temp_str = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -258,7 +258,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_namespace_set_uri(axiom_namespace_t *om_namespace,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     const axis2_char_t *uri)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -281,7 +281,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_namespace_increment_ref(struct axiom_namespace *om_namespace,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     om_namespace->ref++;
@@ -289,7 +289,7 @@
 }
 
 AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
-axiom_namespace_create_str(const axis2_env_t *env,
+axiom_namespace_create_str(const axutil_env_t *env,
     axis2_string_t * uri,
     axis2_string_t * prefix)
 {
@@ -339,7 +339,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_namespace_set_uri_str(axiom_namespace_t *om_namespace,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_string_t *uri)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -363,14 +363,14 @@
 
 AXIS2_EXTERN axis2_string_t *AXIS2_CALL
 axiom_namespace_get_uri_str(axiom_namespace_t *om_namespace,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return om_namespace->uri;
 }
 
 AXIS2_EXTERN axis2_string_t *AXIS2_CALL
 axiom_namespace_get_prefix_str(axiom_namespace_t *om_namespace,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return om_namespace->prefix;
 }

Modified: webservices/axis2/trunk/c/axiom/src/om/om_navigator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_navigator.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_navigator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_navigator.c Fri Mar 30 10:26:22 2007
@@ -19,7 +19,7 @@
 
 static void
 axiom_navigator_update_next_node(axiom_navigator_t *om_navigator,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 struct axiom_navigator
 {
@@ -40,7 +40,7 @@
 };
 
 AXIS2_EXTERN axiom_navigator_t *AXIS2_CALL
-axiom_navigator_create(const axis2_env_t *env,
+axiom_navigator_create(const axutil_env_t *env,
     axiom_node_t *om_node)
 {
     axiom_navigator_t *om_navigator = NULL;
@@ -72,7 +72,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axiom_navigator_free(axiom_navigator_t *om_navigator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env , AXIS2_FAILURE);
     AXIS2_FREE(env->allocator, om_navigator);
@@ -81,7 +81,7 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axiom_navigator_is_navigable(axiom_navigator_t *om_navigator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (AXIS2_TRUE == om_navigator->end)
     {
@@ -99,7 +99,7 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axiom_navigator_is_completed(axiom_navigator_t *om_navigator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return om_navigator->end;
 }
@@ -107,14 +107,14 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axiom_navigator_visited(axiom_navigator_t *om_navigator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return om_navigator->visited;
 }
 
 AXIS2_EXTERN axiom_node_t *AXIS2_CALL
 axiom_navigator_next(axiom_navigator_t *om_navigator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
 
@@ -147,7 +147,7 @@
 /** this method encapsulate searching logic */
 static void
 axiom_navigator_update_next_node(axiom_navigator_t *om_navigator,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (!om_navigator)
     {

Modified: webservices/axis2/trunk/c/axiom/src/om/om_node.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_node.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_node.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_node.c Fri Mar 30 10:26:22 2007
@@ -52,7 +52,7 @@
 };
 
 AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-axiom_node_create(const axis2_env_t *env)
+axiom_node_create(const axutil_env_t *env)
 {
     axiom_node_t *node = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -84,7 +84,7 @@
 */
 AXIS2_EXTERN void AXIS2_CALL
 axiom_node_free(axiom_node_t *om_node,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axiom_node_t *child_node = NULL;
     AXIS2_ENV_CHECK(env, void);
@@ -145,7 +145,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_add_child(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *child)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -179,7 +179,7 @@
 
 AXIS2_EXTERN axiom_node_t *AXIS2_CALL
 axiom_node_detach(axiom_node_t *om_node,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     axiom_node_t *parent = NULL;
 
@@ -235,7 +235,7 @@
 */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_set_parent(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t * parent)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -272,7 +272,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_insert_sibling_after(axiom_node_t * om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t * node_to_insert)
 {
     axiom_node_t *next_sib = NULL;
@@ -300,7 +300,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_insert_sibling_before(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t * node_to_insert)
 {
     axiom_node_t *prev_sibling = NULL;
@@ -335,7 +335,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_serialize(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_output_t *om_output)
 {
 
@@ -504,7 +504,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_serialize_sub_tree(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_output_t *om_output)
 {
 
@@ -707,14 +707,14 @@
 
 AXIS2_EXTERN axiom_node_t *AXIS2_CALL
 axiom_node_get_parent(axiom_node_t *om_node,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return om_node->parent;
 }
 
 AXIS2_EXTERN axiom_node_t *AXIS2_CALL
 axiom_node_get_first_child(axiom_node_t *om_node,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     int token = 0;
     if (! om_node)
@@ -738,7 +738,7 @@
 
 AXIS2_EXTERN axiom_node_t *AXIS2_CALL
 axiom_node_get_first_element(axiom_node_t *om_node,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     int token = 0;
     axiom_node_t *first_element;
@@ -769,21 +769,21 @@
 
 AXIS2_EXTERN axiom_node_t *AXIS2_CALL
 axiom_node_get_last_child(axiom_node_t *om_node,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return om_node->last_child;
 }
 
 AXIS2_EXTERN axiom_node_t *AXIS2_CALL
 axiom_node_get_previous_sibling(axiom_node_t *om_node,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return om_node->prev_sibling;
 }
 
 AXIS2_EXTERN axiom_node_t *AXIS2_CALL
 axiom_node_get_next_sibling(axiom_node_t *om_node,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     int token = 0;
     if (!om_node)
@@ -806,14 +806,14 @@
 
 AXIS2_EXTERN axiom_types_t AXIS2_CALL
 axiom_node_get_node_type(axiom_node_t *om_node,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return om_node->node_type;
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axiom_node_is_complete(axiom_node_t *om_node,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return om_node->done;
 
@@ -821,14 +821,14 @@
 
 AXIS2_EXTERN struct axiom_document *AXIS2_CALL
 axiom_node_get_document(axiom_node_t *om_node,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return om_node->om_doc;
 }
 
 AXIS2_EXTERN void* AXIS2_CALL
 axiom_node_get_data_element(axiom_node_t *om_node,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return om_node->data_element;
 }
@@ -838,7 +838,7 @@
   only sets the first_child link because this is needed by builder
 */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_node_set_first_child(axiom_node_t *om_node, const axis2_env_t *env,
+axiom_node_set_first_child(axiom_node_t *om_node, const axutil_env_t *env,
     axiom_node_t *first_child)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -858,7 +858,7 @@
 */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_set_previous_sibling(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *prev_sibling)
 {
 
@@ -876,7 +876,7 @@
 */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_set_next_sibling(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *next_sibling)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -893,7 +893,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_set_node_type(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_types_t type)
 {
 
@@ -909,7 +909,7 @@
 */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_set_data_element(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void* data_element)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -926,7 +926,7 @@
 */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_set_complete(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t done)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -942,7 +942,7 @@
 */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_set_document(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     struct axiom_document *om_doc)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -959,7 +959,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_node_set_builder(axiom_node_t *om_node,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_stax_builder_t* builder)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -975,7 +975,7 @@
  */
 AXIS2_EXTERN axiom_stax_builder_t *AXIS2_CALL
 axiom_node_get_builder(axiom_node_t *om_node,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     if (!om_node)
     {
@@ -986,7 +986,7 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axiom_node_to_string(axiom_node_t *om_node,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     int status = AXIS2_SUCCESS;
     axiom_output_t *om_output = NULL;



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


Mime
View raw message