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 [2/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/axiom/include/axiom_document.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_document.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_document.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_document.h Fri Mar 30 10:26:22 2007
@@ -18,7 +18,7 @@
 #ifndef AXIOM_DOCUMENT_H
 #define AXIOM_DOCUMENT_H
 
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_node.h>
 #include <axis2_utils_defines.h>
 #include <axiom_output.h>
@@ -55,7 +55,7 @@
       * @return pointer to the newly created document.
       */
     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,
             struct axiom_stax_builder *builder);
     /**
@@ -66,7 +66,7 @@
       */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_document_free(struct axiom_document *document,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /** Builds the next node if the builder is not finished with input xml stream
       * @param document document whose next node is to be built. cannot be NULL
@@ -76,7 +76,7 @@
 
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_document_build_next(struct axiom_document *document,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /**
       * Gets the root element of the document.
@@ -87,7 +87,7 @@
       */
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_document_get_root_element(struct axiom_document *document,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /**
       * set the root element of the document. IF a root node is already exist,it is freed 
@@ -99,7 +99,7 @@
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_document_set_root_element(struct axiom_document *document,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axiom_node_t *om_node);
     /**
      * This method builds the rest of the xml input stream from current position till
@@ -109,7 +109,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);
     /**
      * get builder
      * @return builder , returns NULL if a builder is not associated with 
@@ -117,14 +117,14 @@
      */
     AXIS2_EXTERN struct axiom_stax_builder* AXIS2_CALL
                 axiom_document_get_builder(struct axiom_document *document,
-                        const axis2_env_t *env);
+                        const axutil_env_t *env);
     /**
      * @param om_document
      * @return status code AXIS2_SUCCESS on success , otherwise AXIS2_FAILURE
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_document_serialize(struct axiom_document *document,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axiom_output_t *om_output);
 
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_element.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_element.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_element.h Fri Mar 30 10:26:22 2007
@@ -54,7 +54,7 @@
       * @return a pointer to the newly created element struct
       */
     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,
@@ -71,7 +71,7 @@
       * @return a pointer to the newly created element struct
       */
     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);
@@ -89,7 +89,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 *node,
             const axis2_char_t *uri,
             const axis2_char_t *prefix);
@@ -104,13 +104,13 @@
       */
     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);
 
     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);
             
     /**
@@ -125,7 +125,7 @@
      */
     AXIS2_EXTERN axiom_namespace_t * AXIS2_CALL
     axiom_element_find_namespace_with_qname(axiom_element_t *om_element,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axiom_node_t *node,
             axis2_qname_t *qname);
 
@@ -139,7 +139,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 *node);
 
@@ -153,7 +153,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);
 
     /**
@@ -166,7 +166,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);
 
     /**
@@ -177,7 +177,7 @@
       */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_element_free(axiom_element_t *element,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /**
       * Serializes the start part of the given element
@@ -188,7 +188,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);
 
@@ -202,7 +202,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);
     /**
      *  finds a namespace in current elements scope
@@ -215,7 +215,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);
 
@@ -228,7 +228,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);
     /**
      * set the localname of this element
      * @param om_element om_element_struct to with localname is set
@@ -239,7 +239,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);
     /**
      * get the namespace  of om_element 
@@ -251,7 +251,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);
     /**
      * set the namespace of the element
@@ -263,13 +263,13 @@
      */
     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);
 
     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);
     /**
      * get  the attribute list of the element 
@@ -280,7 +280,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);
     /**
      * get the namespace list of the element
      * @param om_element om element
@@ -290,7 +290,7 @@
      */
     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 qname of this element
      * the returned qname should not be externaly freed
@@ -300,7 +300,7 @@
      */
     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);
 
     /**
@@ -309,7 +309,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);
 
     /**
@@ -325,7 +325,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);
     /**
@@ -334,7 +334,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);
@@ -350,7 +350,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);
     /**
      * Sets the text of the given element.
@@ -359,7 +359,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);
     /**
@@ -370,7 +370,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);
 
     /**
@@ -381,7 +381,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_element_node);
     /**
@@ -391,7 +391,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);
     /**
      * returns an iterator with child elements of type AXIOM_ELEMENT
@@ -404,7 +404,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);
     /**
      * builds this om_element_node completely, This is only possible 
@@ -418,19 +418,19 @@
      */
     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 *element_node);
 
     /**
      * retrieves the default namespace of this element , if available,
      * @param om_element pointer to om element
-     * @param env axis2_environment MUST Not be NULL
+     * @param env axutil_environment MUST Not be NULL
      * @returns pointer to default namespace if availale , NULL otherwise
      */
     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);
 
     /**
@@ -442,7 +442,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);
 
     /**
@@ -456,7 +456,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);
     /**
@@ -468,7 +468,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);
 
     /**
@@ -477,16 +477,16 @@
      */
     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_EXTERN axis2_char_t* AXIS2_CALL
     axiom_element_get_attribute_value_by_name(axiom_element_t *om_ele,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axis2_char_t *attr_name);
 
     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,
@@ -494,11 +494,11 @@
 
     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);
 
     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);
 
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.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 <axis2_hash.h>
@@ -47,36 +47,36 @@
 
     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,
         void *callback_ctx,
         axis2_char_t *mime_boundary);
 
     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);
 
     /** Deallocate memory
       * @return status code
       */
     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_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);
 
     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);
 
     /**
      * Creates mime_parser struct
      * @return pointer to newly created mime_parser
      */
     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);
 
 #define AXIOM_MIME_PARSER_FREE(mime_parser, env) \
 axiom_mime_parser_free (mime_parser, env)

Modified: webservices/axis2/trunk/c/axiom/include/axiom_namespace.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_namespace.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_namespace.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_namespace.h Fri Mar 30 10:26:22 2007
@@ -19,7 +19,7 @@
 #define AXIOM_NAMESPACE_H
 
 #include <axis2_utils_defines.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_output.h>
 #include <axis2_string.h>
 
@@ -43,7 +43,7 @@
       * @return a pointer to newly created namespace struct
       */
     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);
 
@@ -55,7 +55,7 @@
       */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_namespace_free(struct axiom_namespace *om_namespace,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
       * Compares two namepsaces
@@ -66,7 +66,7 @@
       */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axiom_namespace_equals(struct axiom_namespace *om_namespace,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         struct axiom_namespace *om_namespace1);
 
     /**
@@ -78,7 +78,7 @@
       */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_namespace_serialize(struct axiom_namespace *om_namespace,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_output_t * om_output);
 
     /**
@@ -88,7 +88,7 @@
       */
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     axiom_namespace_get_uri(struct axiom_namespace *om_namespace,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
       * @param om_namespace pointer to om namespace struct
@@ -97,7 +97,7 @@
       */
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     axiom_namespace_get_prefix(struct axiom_namespace *om_namespace,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
       * Clones an om_namespace struct
@@ -107,7 +107,7 @@
       */
     AXIS2_EXTERN struct axiom_namespace *AXIS2_CALL
     axiom_namespace_clone(struct axiom_namespace *om_namespace,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
       * to string , returns the string by combining namespace_uri,
@@ -119,29 +119,29 @@
       */
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     axiom_namespace_to_string(struct axiom_namespace *om_namespace,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     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_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);
 
     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_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);
 
     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);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_navigator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_navigator.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_navigator.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_navigator.h Fri Mar 30 10:26:22 2007
@@ -19,7 +19,7 @@
 #define AXIOM_NAVIGATOR_H
 
 #include <axis2_utils.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_node.h>
 
 #ifdef __cplusplus
@@ -43,7 +43,7 @@
      * or returns NULL on error
      */
     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 *node);
 
     /**
@@ -54,7 +54,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_navigator_free(axiom_navigator_t *om_navigator,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Returns the navigable status 
@@ -65,7 +65,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);
 
     /**
      * Returns the build status of this node 
@@ -78,7 +78,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);
 
     /**
      * gets the next node 
@@ -92,7 +92,7 @@
 
     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);
 
     /**
      * method visited 
@@ -103,7 +103,7 @@
      */
     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);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_node.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_node.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_node.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_node.h Fri Mar 30 10:26:22 2007
@@ -35,7 +35,7 @@
  * @file axiom_node.h
  * @brief defines axiom_node struct and its ops
  */
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_utils.h>
 
 
@@ -88,7 +88,7 @@
       * @return a pointer to newly created node struct. NULL on error. 
       */
     AXIS2_EXTERN axiom_node_t * AXIS2_CALL
-    axiom_node_create(const axis2_env_t *env);
+    axiom_node_create(const axutil_env_t *env);
 
     /**
     * Frees an om node and all of its children
@@ -98,7 +98,7 @@
     */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_node_free(axiom_node_t *om_node,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
     /**
     * Adds given node as child to parent. child should not have a parent
     * if child has a parent it will be detached from existing parent
@@ -109,7 +109,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);
 
     /**
@@ -121,7 +121,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);
 
     /**
     * Inserts a sibling node after the given node
@@ -132,7 +132,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);
 
     /**
@@ -144,7 +144,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);
 
     /**
@@ -157,7 +157,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,
             struct axiom_output *om_output);
 
     /** get parent of om_node
@@ -169,7 +169,7 @@
 
     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);
 
     /**
     * get the first child of om_node
@@ -180,7 +180,7 @@
     */
     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);
 
 	/**get the first AXIOM_ELEMENT in om_node
 	 * @param om_node node
@@ -190,7 +190,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);
 
     /**
     * get the last child
@@ -200,7 +200,7 @@
     */
     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);
     /**
     * get the previous sibling 
     * @param om_node om_node struct 
@@ -210,7 +210,7 @@
     */
     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);
     /**
     * get next sibling
     * @param om_node om_node struct
@@ -219,7 +219,7 @@
     */
     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);
     /**
     * get the node type of this element
     * Node type can be one of AXIOM_ELEMENT, AXIOM_COMMENT, AXIOM_TEXT
@@ -230,7 +230,7 @@
     */
     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);
     /**
     * get the struct contained in the node
     * IF the node is on type AXIOM_ELEMENT , this method returns
@@ -242,7 +242,7 @@
     */
     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);
     /**
     * Indicates whether parser has parsed this information item completely or not 
     * @param om_node om_node struct
@@ -252,7 +252,7 @@
     */
     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);
     /**
      * returns the associated document,
      * only valid if built using builder and for a node of type 
@@ -263,15 +263,15 @@
      */
     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);
 
     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);
 
     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,
         struct axiom_output *om_output);
 
 #define AXIOM_NODE_FREE_TREE(om_node,env) \

Modified: webservices/axis2/trunk/c/axiom/include/axiom_output.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_output.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_output.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_output.h Fri Mar 30 10:26:22 2007
@@ -20,7 +20,7 @@
 
 #include <axis2_utils_defines.h>
 #include <axis2_utils.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_node.h>
 #include <axiom_xml_writer.h>
 
@@ -49,7 +49,7 @@
      * @return a pointer to newly created output struct.
      */
     AXIS2_EXTERN axiom_output_t *AXIS2_CALL
-    axiom_output_create(const axis2_env_t *env,
+    axiom_output_create(const axutil_env_t *env,
         axiom_xml_writer_t *xml_writer);
 
     /**
@@ -63,13 +63,13 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_output_write(axiom_output_t * om_output,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_types_t type,
         int no_of_args, ...);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_output_write_optimized(axiom_output_t *om_output,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         struct axiom_text *om_text);
 
     /**
@@ -81,7 +81,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_output_free(axiom_output_t *om_output,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * If the xml to be serialized is soap 11, this property is set to true
@@ -91,21 +91,21 @@
      */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axiom_output_is_soap11(axiom_output_t *om_output,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * @returns true if the ignore_xml_declaration property is true   
      */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axiom_output_is_ignore_xml_declaration(axiom_output_t *om_output,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets the ignore_xml_declaration property is true
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_output_set_ignore_xml_declaration(axiom_output_t *om_output,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_bool_t ignore_xml_dec);
 
     /**
@@ -113,7 +113,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_output_set_soap11(axiom_output_t *om_output,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_bool_t soap11);
 
     /**
@@ -121,7 +121,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_output_set_xml_version(axiom_output_t *om_output,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *xml_version);
 
     /**
@@ -129,14 +129,14 @@
      */
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     axiom_output_get_xml_version(axiom_output_t *om_output,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets the char set encoding property
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_output_set_char_set_encoding(axiom_output_t *om_output,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *char_set_encoding);
 
     /**
@@ -144,14 +144,14 @@
      */
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     axiom_output_get_char_set_encoding(axiom_output_t *om_output,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Sets the do optimize property true
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_output_set_do_optimize(axiom_output_t *om_output,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_bool_t optimize);
 
     /**
@@ -159,7 +159,7 @@
      */
     AXIS2_EXTERN axiom_xml_writer_t *AXIS2_CALL
     axiom_output_get_xml_writer(axiom_output_t *om_output,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      *  Returns the content type
@@ -170,44 +170,44 @@
      */
     AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
     axiom_output_get_content_type(axiom_output_t *om_output,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Writes the xml versio encoding 
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_output_write_xml_version_encoding(axiom_output_t *om_output,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * @returns whether the output is to be optimized 
      */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axiom_output_is_optimized(axiom_output_t *om_output,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /** 
      * Returns the next content id
      */
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     axiom_output_get_next_content_id(axiom_output_t *om_output,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * root content id
      */
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     axiom_output_get_root_content_id(axiom_output_t *om_output,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     axiom_output_get_mime_boundry(axiom_output_t *om_output,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_byte_t *AXIS2_CALL
     axiom_output_flush(axiom_output_t *om_output,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_byte_t **output_stream,
         int *output_stream_size);
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_processing_instruction.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_processing_instruction.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_processing_instruction.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_processing_instruction.h Fri Mar 30 10:26:22 2007
@@ -47,7 +47,7 @@
       * @return a pointer tonewly created processing instruction struct 
       */
     AXIS2_EXTERN axiom_processing_instruction_t * AXIS2_CALL
-    axiom_processing_instruction_create(const axis2_env_t *env,
+    axiom_processing_instruction_create(const axutil_env_t *env,
         axiom_node_t * parent,
         const axis2_char_t * target,
         const axis2_char_t * value,
@@ -61,7 +61,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_processing_instruction_free(struct axiom_processing_instruction * om_pi,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
     
     /**
      * Set processing instruction data
@@ -71,7 +71,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_processing_instruction_set_value(struct axiom_processing_instruction *om_pi,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t* value);
 
     /**
@@ -84,7 +84,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_processing_instruction_set_target(struct axiom_processing_instruction *om_pi,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t* target);
 
     /**
@@ -95,7 +95,7 @@
      */
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axiom_processing_instruction_get_target(struct axiom_processing_instruction *om_pi,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * Get data part of processing_instruction
@@ -105,7 +105,7 @@
      */
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axiom_processing_instruction_get_value(struct axiom_processing_instruction *om_pi,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /**
      * Serialize function
@@ -117,7 +117,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_processing_instruction_serialize(struct axiom_processing_instruction *om_pi,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_output_t *om_output);
 
     /** @} */

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_body.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_body.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_body.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_body.h Fri Mar 30 10:26:22 2007
@@ -23,7 +23,7 @@
  * @brief axiom_soap_body struct
  */
 
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_node.h>
 #include <axiom_element.h>
 #include <axiom_namespace.h>
@@ -62,7 +62,7 @@
       */
 
     AXIS2_EXTERN axiom_soap_body_t * AXIS2_CALL
-    axiom_soap_body_create_with_parent(const axis2_env_t *env,
+    axiom_soap_body_create_with_parent(const axutil_env_t *env,
             struct axiom_soap_envelope *envelope);
 
     /**
@@ -74,7 +74,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_soap_body_free(axiom_soap_body_t *body,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /**
      * Indicates whether a soap fault is available with this 
@@ -85,7 +85,7 @@
      */
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axiom_soap_body_has_fault(axiom_soap_body_t *body,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /**
      * returns the soap fault in this soap_body 
@@ -97,7 +97,7 @@
     */
     AXIS2_EXTERN axiom_soap_fault_t* AXIS2_CALL
     axiom_soap_body_get_fault(axiom_soap_body_t *body,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /**
      * get the underlying om_node 
@@ -107,7 +107,7 @@
      */
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_soap_body_get_base_node(axiom_soap_body_t *body,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /**
      *  return the soap version 
@@ -117,7 +117,7 @@
      */
     AXIS2_EXTERN int AXIS2_CALL
     axiom_soap_body_get_soap_version(axiom_soap_body_t *body,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
 
     /**
@@ -126,19 +126,19 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_body_build(axiom_soap_body_t *body,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /** add an om node as the child to this soap_body
      * the child is added to as the first child 
      * @param body pointer to soap_body struct
-     * @param env axis2_environment struct MUST not be NULL
+     * @param env axutil_environment struct MUST not be NULL
      * @returns status code , AXIS2_SUCCESS on success , AXIS2_ERROR
      * otherwise
      */
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_body_add_child(axiom_soap_body_t *body,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axiom_node_t *child);
 
 	/**
@@ -148,7 +148,7 @@
 	 */
 	AXIS2_EXTERN axis2_status_t AXIS2_CALL
 	axiom_soap_body_convert_fault_to_soap11(axiom_soap_body_t *soap_body,
-		const axis2_env_t *env);
+		const axutil_env_t *env);
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_builder.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_builder.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_builder.h Fri Mar 30 10:26:22 2007
@@ -45,58 +45,58 @@
      * @param env Environment. MUST NOT be NULL
      */
     AXIS2_EXTERN axiom_soap_builder_t * AXIS2_CALL
-    axiom_soap_builder_create(const axis2_env_t *env,
+    axiom_soap_builder_create(const axutil_env_t *env,
             axiom_stax_builder_t *builder,
             const axis2_char_t *soap_version);
 
     AXIS2_EXTERN void AXIS2_CALL 
     axiom_soap_builder_free(axiom_soap_builder_t *builder,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axiom_soap_envelope_t* AXIS2_CALL
     axiom_soap_builder_get_soap_envelope(axiom_soap_builder_t *builder,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axiom_document_t* AXIS2_CALL
     axiom_soap_builder_get_document(axiom_soap_builder_t *builder,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_builder_next(axiom_soap_builder_t *builder,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL 
     axiom_soap_builder_get_document_element(axiom_soap_builder_t *builder,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
     axiom_soap_builder_set_bool_processing_mandatory_fault_elements(axiom_soap_builder_t *builder,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axis2_bool_t value);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
     axiom_soap_builder_set_processing_detail_elements(axiom_soap_builder_t *builder,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axis2_bool_t value);
 
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
     axiom_soap_builder_is_processing_detail_elements(axiom_soap_builder_t *builder,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
 
     AXIS2_EXTERN int AXIS2_CALL 
     axiom_soap_builder_get_soap_version(axiom_soap_builder_t *builder,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
     axiom_soap_builder_process_namespace_data(axiom_soap_builder_t *builder,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axiom_node_t *om_node,
             axis2_bool_t is_soap_element);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
     axiom_soap_builder_set_mime_body_parts(axiom_soap_builder_t *builder,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axis2_hash_t *map);
 
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_envelope.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_envelope.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_envelope.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_envelope.h Fri Mar 30 10:26:22 2007
@@ -23,7 +23,7 @@
  * @brief axiom_soap_envelope struct
  *        corresponds to root element of soap message
  */
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_node.h>
 #include <axiom_element.h>
 #include <axiom_namespace.h>
@@ -53,7 +53,7 @@
      * as the prefix and uri, The uri of ns should be valid soap uri
      */
     AXIS2_EXTERN axiom_soap_envelope_t* AXIS2_CALL
-    axiom_soap_envelope_create(const axis2_env_t *env,
+    axiom_soap_envelope_create(const axutil_env_t *env,
         axiom_namespace_t *ns);
 
     /**
@@ -67,16 +67,16 @@
      * 
      */
     AXIS2_EXTERN axiom_soap_envelope_t* AXIS2_CALL
-    axiom_soap_envelope_create_with_soap_version_prefix(const axis2_env_t *env,
+    axiom_soap_envelope_create_with_soap_version_prefix(const axutil_env_t *env,
         int soap_version,
         const axis2_char_t *prefix);
 
     AXIS2_EXTERN axiom_soap_envelope_t* AXIS2_CALL
-    axiom_soap_envelope_create_default_soap_envelope(const axis2_env_t *env,
+    axiom_soap_envelope_create_default_soap_envelope(const axutil_env_t *env,
         int soap_version);
 
     AXIS2_EXTERN axiom_soap_envelope_t* AXIS2_CALL
-    axiom_soap_envelope_create_default_soap_fault_envelope(const axis2_env_t *env,
+    axiom_soap_envelope_create_default_soap_fault_envelope(const axutil_env_t *env,
         const axis2_char_t *code_value,
         const axis2_char_t *reason_text,
         const int soap_version,
@@ -91,7 +91,7 @@
      */
     AXIS2_EXTERN struct axiom_soap_header* AXIS2_CALL
     axiom_soap_envelope_get_header(axiom_soap_envelope_t *envelope,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
     /**
      * Returns the soap body associated with this soap envelope
      * @param envelope soap_envelope
@@ -100,7 +100,7 @@
      */
     AXIS2_EXTERN struct axiom_soap_body* AXIS2_CALL
     axiom_soap_envelope_get_body(axiom_soap_envelope_t *envelope,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
     /**
      * serialize function , serialize the soap envelope 
      * IF the soap version it set to soap11 the soap fault part is converted 
@@ -114,7 +114,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_envelope_serialize(axiom_soap_envelope_t *envelope,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_output_t *om_output,
         axis2_bool_t cache);
 
@@ -129,7 +129,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_soap_envelope_free(axiom_soap_envelope_t *envelope,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
      * returns the om_node associated with this soap envelope
@@ -139,7 +139,7 @@
      */
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_soap_envelope_get_base_node(axiom_soap_envelope_t *envelope,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
     /** returns the soap version of this soap envelope
@@ -149,7 +149,7 @@
      */
     AXIS2_EXTERN int AXIS2_CALL
     axiom_soap_envelope_get_soap_version(axiom_soap_envelope_t *envelope,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /** return the soap envelope namespace
      * @param envelope 
@@ -158,11 +158,11 @@
      */
     AXIS2_EXTERN axiom_namespace_t* AXIS2_CALL
     axiom_soap_envelope_get_namespace(axiom_soap_envelope_t *envelope,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_envelope_set_soap_version(axiom_soap_envelope_t *envelope,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int soap_version);
 
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault.h Fri Mar 30 10:26:22 2007
@@ -24,7 +24,7 @@
  * @brief axiom_soap_fault struct
  */
 #include <axiom_soap_const.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_node.h>
 #include <axiom_element.h>
 
@@ -63,7 +63,7 @@
      *  otherwise return NULL with error code set in environments error
      */
     AXIS2_EXTERN axiom_soap_fault_t * AXIS2_CALL
-    axiom_soap_fault_create_with_parent(const axis2_env_t *env,
+    axiom_soap_fault_create_with_parent(const axutil_env_t *env,
             struct axiom_soap_body *parent);
 
     /** create an returns a axiom_soap_fault_t struct with a soap fault detail
@@ -76,12 +76,12 @@
      * otherwise return NULL
      */
     AXIS2_EXTERN axiom_soap_fault_t * AXIS2_CALL
-    axiom_soap_fault_create_with_exception(const axis2_env_t *env,
+    axiom_soap_fault_create_with_exception(const axutil_env_t *env,
             struct axiom_soap_body *parent,
             axis2_char_t* exception);
 
     AXIS2_EXTERN axiom_soap_fault_t * AXIS2_CALL
-    axiom_soap_fault_create_default_fault(const axis2_env_t *env,
+    axiom_soap_fault_create_default_fault(const axutil_env_t *env,
             struct axiom_soap_body *parent,
             const axis2_char_t *code_value,
             const axis2_char_t *reason_text,
@@ -97,7 +97,7 @@
 
     AXIS2_EXTERN void AXIS2_CALL
     axiom_soap_fault_free(axiom_soap_fault_t *fault,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
     /**
       * this function returns a axiom_soap_fault_code struct
       * if a fault code is associated with this soap fault
@@ -109,7 +109,7 @@
       */
     AXIS2_EXTERN struct axiom_soap_fault_code * AXIS2_CALL
     axiom_soap_fault_get_code(axiom_soap_fault_t *fault,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
     /**
      * @param fault soap fault struct
      * @param env environment must not be NULL
@@ -119,7 +119,7 @@
 
     AXIS2_EXTERN struct axiom_soap_fault_reason * AXIS2_CALL
     axiom_soap_fault_get_reason(axiom_soap_fault_t *fault,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /**
      * @param fault soap fault struct
@@ -129,7 +129,7 @@
      */
     AXIS2_EXTERN struct axiom_soap_fault_node* AXIS2_CALL
     axiom_soap_fault_get_node(axiom_soap_fault_t *fault,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /**
      * @param fault soap fault struct
@@ -139,7 +139,7 @@
      */
     AXIS2_EXTERN struct axiom_soap_fault_role* AXIS2_CALL
     axiom_soap_fault_get_role(axiom_soap_fault_t *fault,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
     /**
       * @param fault soap fault struct
       * @param env environment must not be NULL
@@ -149,7 +149,7 @@
 
     AXIS2_EXTERN struct axiom_soap_fault_detail* AXIS2_CALL
     axiom_soap_fault_get_detail(axiom_soap_fault_t *fault,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
     /**
       * @param fault soap fault struct 
       * @param env enviroment must not be NULL
@@ -158,7 +158,7 @@
       */
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     axiom_soap_fault_get_exception(axiom_soap_fault_t *fault,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
     /**
       * set an error string 
       * @param fualt soap fault struct
@@ -167,7 +167,7 @@
       */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_fault_set_exception(axiom_soap_fault_t *fault,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axis2_char_t *exception);
     /**
       * returns the axiom_node_t struct which is wrapped by
@@ -179,7 +179,7 @@
       */
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_soap_fault_get_base_node(axiom_soap_fault_t *fault,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_code.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_code.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_code.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_code.h Fri Mar 30 10:26:22 2007
@@ -23,7 +23,7 @@
  * @file axiom_soap_fault_code.h
  * @brief axiom_soap_fault_code struct
  */
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_soap_fault.h>
 
 #ifdef __cplusplus
@@ -48,11 +48,11 @@
       * @param env Environment. MUST NOT be NULL
       */
     AXIS2_EXTERN axiom_soap_fault_code_t * AXIS2_CALL
-    axiom_soap_fault_code_create_with_parent(const axis2_env_t *env,
+    axiom_soap_fault_code_create_with_parent(const axutil_env_t *env,
             axiom_soap_fault_t *fault);
 
     AXIS2_EXTERN axiom_soap_fault_code_t * AXIS2_CALL
-    axiom_soap_fault_code_create_with_parent_value(const axis2_env_t *env,
+    axiom_soap_fault_code_create_with_parent_value(const axutil_env_t *env,
             axiom_soap_fault_t *fault,
             axis2_char_t *value);
 
@@ -65,7 +65,7 @@
       */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_soap_fault_code_free(axiom_soap_fault_code_t *fault_code,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
     /**
     * @returns axiom_soap_fault_sub_code struct if one is associated with
     * this fault_code struct , otherwise teturns NULL
@@ -73,18 +73,18 @@
 
     AXIS2_EXTERN struct axiom_soap_fault_sub_code* AXIS2_CALL
     axiom_soap_fault_code_get_sub_code(axiom_soap_fault_code_t *fault_code,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /**
       * @returns soap_fault_value if available
     */
     AXIS2_EXTERN struct axiom_soap_fault_value* AXIS2_CALL
     axiom_soap_fault_code_get_value(axiom_soap_fault_code_t *fault_code,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_soap_fault_code_get_base_node(axiom_soap_fault_code_t *fault_code,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_detail.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_detail.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_detail.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_detail.h Fri Mar 30 10:26:22 2007
@@ -23,7 +23,7 @@
  * @brief axiom_soap_fault_detail struct
  */
 
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_soap_fault.h>
 #include <axiom_children_iterator.h>
 
@@ -46,7 +46,7 @@
       */
     AXIS2_EXTERN axiom_soap_fault_detail_t * AXIS2_CALL
     axiom_soap_fault_detail_create_with_parent
-    (const axis2_env_t *env,
+    (const axutil_env_t *env,
             axiom_soap_fault_t *fault);
 
     /**
@@ -59,20 +59,20 @@
 
     AXIS2_EXTERN void AXIS2_CALL
     axiom_soap_fault_detail_free(axiom_soap_fault_detail_t *fault_detail,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_fault_detail_add_detail_entry(axiom_soap_fault_detail_t *fault_detail,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axiom_node_t *ele_node);
 
     AXIS2_EXTERN axiom_children_iterator_t* AXIS2_CALL
     axiom_soap_fault_detail_get_all_detail_entries(axiom_soap_fault_detail_t *fault_detail,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_soap_fault_detail_get_base_node(axiom_soap_fault_detail_t *fault_code,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
 
     /** @} */

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_node.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_node.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_node.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_node.h Fri Mar 30 10:26:22 2007
@@ -22,7 +22,7 @@
  * @file axiom_soap_fault_node.h
  * @brief axiom_soap_fault_node struct
  */
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_soap_fault.h>
 
 #ifdef __cplusplus
@@ -42,7 +42,7 @@
       * @param env Environment. MUST NOT be NULL
       */
     AXIS2_EXTERN axiom_soap_fault_node_t * AXIS2_CALL
-    axiom_soap_fault_node_create_with_parent(const axis2_env_t *env,
+    axiom_soap_fault_node_create_with_parent(const axutil_env_t *env,
             axiom_soap_fault_t *fault);
 
     /**
@@ -55,20 +55,20 @@
 
     AXIS2_EXTERN void AXIS2_CALL
     axiom_soap_fault_node_free(axiom_soap_fault_node_t *fault_node,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_fault_node_set_value(axiom_soap_fault_node_t *fault_node,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axis2_char_t *fault_val);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axiom_soap_fault_node_get_value(axiom_soap_fault_node_t *fault_node,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_soap_fault_node_get_base_node(axiom_soap_fault_node_t *fault_node,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_reason.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_reason.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_reason.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_reason.h Fri Mar 30 10:26:22 2007
@@ -22,7 +22,7 @@
 * @file axiom_soap_fault_reason.h
 * @brief axiom_soap_fault_reason 
 */
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_soap_fault.h>
 #include <axutil_array_list.h>
 
@@ -45,7 +45,7 @@
       * @param env Environment. MUST NOT be NULL
       */
     AXIS2_EXTERN axiom_soap_fault_reason_t * AXIS2_CALL
-    axiom_soap_fault_reason_create_with_parent(const axis2_env_t *env,
+    axiom_soap_fault_reason_create_with_parent(const axutil_env_t *env,
             axiom_soap_fault_t *fault);
 
     /**
@@ -58,29 +58,29 @@
 
     AXIS2_EXTERN void AXIS2_CALL
     axiom_soap_fault_reason_free(axiom_soap_fault_reason_t *fault_reason,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN struct axiom_soap_fault_text* AXIS2_CALL
     axiom_soap_fault_reason_get_soap_fault_text(axiom_soap_fault_reason_t *fault_reason,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axis2_char_t *lang);
 
     AXIS2_EXTERN axutil_array_list_t* AXIS2_CALL
     axiom_soap_fault_reason_get_all_soap_fault_texts(axiom_soap_fault_reason_t *fault_reason,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN struct axiom_soap_fault_text* AXIS2_CALL
     axiom_soap_fault_reason_get_first_soap_fault_text(axiom_soap_fault_reason_t *fault_reason,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_fault_reason_add_soap_fault_text(axiom_soap_fault_reason_t *fault_reason,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             struct axiom_soap_fault_text *fault_text);
 
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_soap_fault_reason_get_base_node(axiom_soap_fault_reason_t *fault_reason,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_role.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_role.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_role.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_role.h Fri Mar 30 10:26:22 2007
@@ -23,7 +23,7 @@
  * @file axiom_soap_fault_role.h
  * @brief axiom_soap_fault_role 
  */
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_soap_fault.h>
 
 #ifdef __cplusplus
@@ -43,7 +43,7 @@
       * @param env Environment. MUST NOT be NULL
       */
     AXIS2_EXTERN axiom_soap_fault_role_t * AXIS2_CALL
-    axiom_soap_fault_role_create_with_parent(const axis2_env_t *env,
+    axiom_soap_fault_role_create_with_parent(const axutil_env_t *env,
             axiom_soap_fault_t *fault);
 
     /**
@@ -56,20 +56,20 @@
 
     AXIS2_EXTERN void AXIS2_CALL
     axiom_soap_fault_role_free(axiom_soap_fault_role_t *fault_role,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_fault_role_set_role_value(axiom_soap_fault_role_t *fault_role,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axis2_char_t* uri);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axiom_soap_fault_role_get_role_value(axiom_soap_fault_role_t *fault_role,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_soap_fault_role_get_base_node(axiom_soap_fault_role_t *fault_role,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_sub_code.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_sub_code.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_sub_code.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_sub_code.h Fri Mar 30 10:26:22 2007
@@ -23,7 +23,7 @@
  * @file axiom_soap_fault_sub_code.h
  * @brief axiom_soap_fault_sub_code struct
  */
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_soap_fault_code.h>
 
 #ifdef __cplusplus
@@ -45,11 +45,11 @@
       * @param env Environment. MUST NOT be NULL
       */
     AXIS2_EXTERN axiom_soap_fault_sub_code_t * AXIS2_CALL
-    axiom_soap_fault_sub_code_create_with_parent(const axis2_env_t *env,
+    axiom_soap_fault_sub_code_create_with_parent(const axutil_env_t *env,
             axiom_soap_fault_code_t *fault_code);
 
     AXIS2_EXTERN axiom_soap_fault_sub_code_t * AXIS2_CALL
-    axiom_soap_fault_sub_code_create_with_parent_value(const axis2_env_t *env,
+    axiom_soap_fault_sub_code_create_with_parent_value(const axutil_env_t *env,
             axiom_soap_fault_code_t *fault_code,
             axis2_char_t *value);
 
@@ -62,19 +62,19 @@
       */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_soap_fault_sub_code_free(axiom_soap_fault_sub_code_t *fault_sub_code,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axiom_soap_fault_sub_code_t* AXIS2_CALL
     axiom_soap_fault_sub_code_get_sub_code(axiom_soap_fault_sub_code_t *fault_sub_code,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN struct axiom_soap_fault_value* AXIS2_CALL
     axiom_soap_fault_sub_code_get_value(axiom_soap_fault_sub_code_t *fault_sub_code,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_soap_fault_sub_code_get_base_node(axiom_soap_fault_sub_code_t *fault_sub_code,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_text.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_text.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_text.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_text.h Fri Mar 30 10:26:22 2007
@@ -22,7 +22,7 @@
  * @file axiom_soap_fault_text.h
  * @brief axiom_soap_fault_text 
  */
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_soap_fault_reason.h>
 
 #ifdef __cplusplus
@@ -42,7 +42,7 @@
       * @param env Environment. MUST NOT be NULL
       */
     AXIS2_EXTERN axiom_soap_fault_text_t * AXIS2_CALL
-    axiom_soap_fault_text_create_with_parent(const axis2_env_t *env,
+    axiom_soap_fault_text_create_with_parent(const axutil_env_t *env,
             axiom_soap_fault_reason_t *fault);
 
     /**
@@ -55,30 +55,30 @@
 
     AXIS2_EXTERN void AXIS2_CALL
     axiom_soap_fault_text_free(axiom_soap_fault_text_t *fault_text,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_fault_text_set_lang(axiom_soap_fault_text_t *fault_text,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             const axis2_char_t* lang);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axiom_soap_fault_text_get_lang(axiom_soap_fault_text_t *fault_text,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_soap_fault_text_get_base_node(axiom_soap_fault_text_t *fault_text,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_fault_text_set_text(axiom_soap_fault_text_t *fault_text,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axis2_char_t *value,
             axis2_char_t *lang);
 
     AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     axiom_soap_fault_text_get_text(axiom_soap_fault_text_t *fault_text,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_value.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_value.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_value.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_value.h Fri Mar 30 10:26:22 2007
@@ -22,7 +22,7 @@
 * @file axiom_soap_fault_value.h
 * @brief axiom_soap_fault_value 
 */
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_soap_fault.h>
 #include <axiom_soap_fault_sub_code.h>
 
@@ -43,11 +43,11 @@
       * @param env Environment. MUST NOT be NULL
       */
     AXIS2_EXTERN axiom_soap_fault_value_t * AXIS2_CALL
-    axiom_soap_fault_value_create_with_subcode(const axis2_env_t *env,
+    axiom_soap_fault_value_create_with_subcode(const axutil_env_t *env,
             axiom_soap_fault_sub_code_t *parent);
 
     AXIS2_EXTERN axiom_soap_fault_value_t * AXIS2_CALL
-    axiom_soap_fault_value_create_with_code(const axis2_env_t *env,
+    axiom_soap_fault_value_create_with_code(const axutil_env_t *env,
             axiom_soap_fault_code_t *parent);
 
     /**
@@ -60,7 +60,7 @@
 
     AXIS2_EXTERN void AXIS2_CALL
     axiom_soap_fault_value_free(axiom_soap_fault_value_t *fault_value,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /**
       * Get the text value of the env:Value element directly under env:Code element
@@ -70,7 +70,7 @@
       */
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axiom_soap_fault_value_get_text(axiom_soap_fault_value_t *fault_value,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /**
       * Set the text value of the env:Value element directly under env:Code element
@@ -80,7 +80,7 @@
       */
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_soap_fault_value_get_base_node(axiom_soap_fault_value_t *fault_value,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
     /**
      * set the text value of soap_fault_value element 
      * @param fault_value pointer to soap fault value struct
@@ -90,7 +90,7 @@
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_fault_value_set_text(axiom_soap_fault_value_t *fault_value,
-            const axis2_env_t *env, axis2_char_t *text);
+            const axutil_env_t *env, axis2_char_t *text);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h Fri Mar 30 10:26:22 2007
@@ -22,7 +22,7 @@
  * @file axiom_soap_header.h
  * @brief axiom_soap_header struct
  */
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_node.h>
 #include <axiom_element.h>
 #include <axutil_array_list.h>
@@ -49,7 +49,7 @@
      */
 
     AXIS2_EXTERN axiom_soap_header_t * AXIS2_CALL
-    axiom_soap_header_create_with_parent(const axis2_env_t *env,
+    axiom_soap_header_create_with_parent(const axutil_env_t *env,
             struct axiom_soap_envelope *envelope);
 
     /**
@@ -61,7 +61,7 @@
       */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_soap_header_free(axiom_soap_header_t *header,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /**
      * create a new axiom_soap_header_block_t struct initialized  with the
@@ -73,7 +73,7 @@
      */
     AXIS2_EXTERN struct axiom_soap_header_block* AXIS2_CALL
     axiom_soap_header_add_header_block(axiom_soap_header_t* header,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             const axis2_char_t *localname,
             axiom_namespace_t *ns);
     /**
@@ -88,7 +88,7 @@
      */
     AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
     axiom_soap_header_examine_header_blocks(axiom_soap_header_t* header,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axis2_char_t* param_role);
     /**
      * returns an arraylist of header_blocks which has a given namesapce uri
@@ -101,7 +101,7 @@
      */
     AXIS2_EXTERN axutil_array_list_t* AXIS2_CALL
     axiom_soap_header_get_header_blocks_with_namespace_uri(axiom_soap_header_t* header,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             const axis2_char_t *ns_uri);
     /**
      * returns an iterator to iterate through all soap header block's om nodes 
@@ -112,7 +112,7 @@
      */
     AXIS2_EXTERN axiom_children_qname_iterator_t* AXIS2_CALL
     axiom_soap_header_examine_all_header_blocks(axiom_soap_header_t* header,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
     /**
      * returns an iterator to iterate through all  header blocks om_nodes 
      * with the matching role attribute
@@ -124,7 +124,7 @@
      */
     AXIS2_EXTERN axiom_children_with_specific_attribute_iterator_t * AXIS2_CALL
     axiom_soap_header_extract_header_blocks(axiom_soap_header_t *header,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axis2_char_t *role);
 
     /**
@@ -135,7 +135,7 @@
      */
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_soap_header_get_base_node(axiom_soap_header_t *header,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
     /**
      *  return the soap_version of this soap_header
      *  @param header soap_header
@@ -144,7 +144,7 @@
      */
     AXIS2_EXTERN int AXIS2_CALL
     axiom_soap_header_get_soap_version(axiom_soap_header_t *header,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /**
      * @returns a hash table of all header_blocks in this header
@@ -152,7 +152,7 @@
      */
     AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
     axiom_soap_header_get_all_header_blocks(axiom_soap_header_t *header,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
     /**
      * remove header block that matches to the given qname
      * qname should not be null
@@ -160,7 +160,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_header_remove_header_block(axiom_soap_header_t *header,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axis2_qname_t *qname);
 
     /** @} */

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_header_block.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_header_block.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_header_block.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_header_block.h Fri Mar 30 10:26:22 2007
@@ -23,7 +23,7 @@
  * @file axiom_soap_header_block.h
  * @brief axiom_soap_header_block struct
  */
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_node.h>
 #include <axiom_element.h>
 #include <axutil_array_list.h>
@@ -48,7 +48,7 @@
     * this is an internal function.
     */
     AXIS2_EXTERN axiom_soap_header_block_t * AXIS2_CALL
-    axiom_soap_header_block_create_with_parent(const axis2_env_t *env,
+    axiom_soap_header_block_create_with_parent(const axutil_env_t *env,
             const axis2_char_t *localname,
             axiom_namespace_t *ns,
             struct axiom_soap_header *parent);
@@ -62,59 +62,59 @@
       */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_soap_header_block_free(axiom_soap_header_block_t *header_block,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_header_block_set_role(axiom_soap_header_block_t *header_block,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axis2_char_t *uri);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_header_block_set_must_understand_with_bool(axiom_soap_header_block_t *header_block,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axis2_bool_t must_understand);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_header_block_set_must_understand_with_string(axiom_soap_header_block_t *header_block,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axis2_char_t *must_understand);
 
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axiom_soap_header_block_get_must_understand(axiom_soap_header_block_t *header_block,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axiom_soap_header_block_is_processed(axiom_soap_header_block_t *header_block,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_header_block_set_processed(axiom_soap_header_block_t *header_block,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axiom_soap_header_block_get_role(axiom_soap_header_block_t *header_block,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap_header_block_set_attribute(axiom_soap_header_block_t *header_block,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             const axis2_char_t *attr_name,
             const axis2_char_t *attr_value,
             const axis2_char_t *soap_envelope_namespace_uri);
 
     AXIS2_EXTERN axis2_char_t* AXIS2_CALL
     axiom_soap_header_block_get_attribute(axiom_soap_header_block_t *header_block,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             const axis2_char_t *attr_name,
             const axis2_char_t *soap_envelope_namespace_uri);
 
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_soap_header_block_get_base_node(axiom_soap_header_block_t *header_block,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     AXIS2_EXTERN int AXIS2_CALL
     axiom_soap_header_block_get_soap_version(axiom_soap_header_block_t *header_block,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_stax_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_stax_builder.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_stax_builder.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_stax_builder.h Fri Mar 30 10:26:22 2007
@@ -21,7 +21,7 @@
 #include <axiom_node.h>
 #include <axiom_xml_reader.h>
 #include <axiom_document.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -43,7 +43,7 @@
       * @return a pointer to the newly created builder struct. 
       */
     AXIS2_EXTERN axiom_stax_builder_t * AXIS2_CALL
-    axiom_stax_builder_create(const axis2_env_t *env,
+    axiom_stax_builder_create(const axutil_env_t *env,
         axiom_xml_reader_t *parser);
 
     /**
@@ -56,7 +56,7 @@
       */
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_stax_builder_next(struct axiom_stax_builder *builder,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
       * Discards the element that is being built currently.
@@ -66,7 +66,7 @@
       */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_stax_builder_discard_current_element(struct axiom_stax_builder *builder,
-            const axis2_env_t *env);
+            const axutil_env_t *env);
    
    /**
      * Free op
@@ -77,7 +77,7 @@
      */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_stax_builder_free(struct axiom_stax_builder *builder,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
    /** Gets the document associated with the builder
      * @param builder axiom_stax_builder 
@@ -88,7 +88,7 @@
      */
     AXIS2_EXTERN axiom_document_t *AXIS2_CALL
     axiom_stax_builder_get_document(struct axiom_stax_builder *builder,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
    /**
      * builder is finished building om structure
@@ -96,7 +96,7 @@
 
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axiom_stax_builder_is_complete(struct axiom_stax_builder* builder,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
    /**
      * moves the reader to next event and returns the token returned
@@ -104,7 +104,7 @@
      */
     AXIS2_EXTERN int AXIS2_CALL
     axiom_stax_builder_next_with_token(struct axiom_stax_builder *builder,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_text.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_text.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_text.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_text.h Fri Mar 30 10:26:22 2007
@@ -18,7 +18,7 @@
 #ifndef AXIOM_TEXT_H
 #define AXIOM_TEXT_H
 
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axiom_node.h>
 #include <axiom_output.h>
 #include <axiom_data_handler.h>
@@ -49,7 +49,7 @@
       * @return pointer to newly created text struct 
       */
     AXIS2_EXTERN axiom_text_t *AXIS2_CALL
-    axiom_text_create(const axis2_env_t *env,
+    axiom_text_create(const axutil_env_t *env,
         axiom_node_t *parent,
         const axis2_char_t *value,
         axiom_node_t ** node);
@@ -66,7 +66,7 @@
       * @return pointer to newly created text struct 
       */
     AXIS2_EXTERN axiom_text_t *AXIS2_CALL
-    axiom_text_create_str(const axis2_env_t *env,
+    axiom_text_create_str(const axutil_env_t *env,
         axiom_node_t *parent,
         axis2_string_t *value,
         axiom_node_t ** node);
@@ -83,7 +83,7 @@
       * @return pointer to newly created text struct 
       */
     AXIS2_EXTERN axiom_text_t *AXIS2_CALL
-    axiom_text_create_with_data_handler(const axis2_env_t *env,
+    axiom_text_create_with_data_handler(const axutil_env_t *env,
         axiom_node_t * parent,
         axiom_data_handler_t* data_handler,
         axiom_node_t **node);
@@ -97,7 +97,7 @@
       */
     AXIS2_EXTERN void AXIS2_CALL
     axiom_text_free(struct axiom_text *om_text,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /**
       * Serialize op
@@ -109,7 +109,7 @@
       */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_text_serialize(struct axiom_text *om_text,
-            const axis2_env_t *env,
+            const axutil_env_t *env,
             axiom_output_t *om_output);
 
    /**
@@ -122,7 +122,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_text_set_value(struct axiom_text *om_text,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *value);
 
    /**
@@ -133,7 +133,7 @@
      */
     AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
     axiom_text_get_value(struct axiom_text *om_text,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 	/**
      * Sets the text value
@@ -145,7 +145,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_text_set_value_str(struct axiom_text *om_text,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_string_t *value);
 
    /**
@@ -156,7 +156,7 @@
      */
     AXIS2_EXTERN axis2_string_t *AXIS2_CALL
     axiom_text_get_value_str(struct axiom_text *om_text,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
    /**
      * Sets optimized 
@@ -167,7 +167,7 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_text_set_optimize(struct axiom_text *om_text,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_bool_t optimize);
 
     /**
@@ -178,16 +178,16 @@
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_text_set_is_binary(struct axiom_text *om_text,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_bool_t is_binary);
 
     AXIS2_EXTERN axiom_data_handler_t *AXIS2_CALL
     axiom_text_get_data_handler(struct axiom_text *om_text,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     axiom_text_get_content_id(struct axiom_text *om_text,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
     /** @} */
 



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