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 [6/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/src/soap/soap_fault_value.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c Fri Mar 30 10:26:22 2007
@@ -27,7 +27,7 @@
 };
 
 AXIS2_EXTERN axiom_soap_fault_value_t * AXIS2_CALL
-axiom_soap_fault_value_create(const axis2_env_t *env)
+axiom_soap_fault_value_create(const axutil_env_t *env)
 {
     axiom_soap_fault_value_t *fault_value = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -49,7 +49,7 @@
 
 
 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)
 {
     axiom_soap_fault_value_t *fault_value = NULL;
@@ -114,7 +114,7 @@
 }
 
 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)
 {
     axiom_soap_fault_value_t *fault_value = NULL;
@@ -172,7 +172,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)
 {
     AXIS2_ENV_CHECK(env, void);
     AXIS2_FREE(env->allocator, fault_value);
@@ -181,7 +181,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_fault_value_set_base_node(axiom_soap_fault_value_t *fault_value,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *node)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -199,14 +199,14 @@
 
 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)
 {
     return fault_value->om_ele_node;
 }
 
 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)
 {
     axiom_node_t *value_node = NULL;
     axiom_element_t *value_element = NULL;
@@ -227,7 +227,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,
+    const axutil_env_t *env,
     axis2_char_t *text)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header.c Fri Mar 30 10:26:22 2007
@@ -41,12 +41,12 @@
 };
 
 static axis2_bool_t AXIS2_CALL
-axiom_soap_header_qname_matches(const axis2_env_t *env,
+axiom_soap_header_qname_matches(const axutil_env_t *env,
         axis2_qname_t *element_qname,
         axis2_qname_t *qname_to_match);
 
 AXIS2_EXTERN axiom_soap_header_t * AXIS2_CALL
-axiom_soap_header_create(const axis2_env_t *env)
+axiom_soap_header_create(const axutil_env_t *env)
 {
     axiom_soap_header_t *soap_header = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -79,7 +79,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,
         axiom_soap_envelope_t *envelope)
 {
     axiom_soap_header_t *soap_header = NULL;
@@ -144,7 +144,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 axiom_soap_header_free(axiom_soap_header_t *soap_header,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, void);
 
@@ -193,7 +193,7 @@
 
 AXIS2_EXTERN axiom_soap_header_block_t* AXIS2_CALL
 axiom_soap_header_add_header_block(axiom_soap_header_t* soap_header,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *localname,
         axiom_namespace_t *ns)
 {
@@ -254,7 +254,7 @@
 AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
 axiom_soap_header_examine_header_blocks
 (axiom_soap_header_t* soap_header,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t* param_role)
 {
     AXIS2_ENV_CHECK(env, NULL);
@@ -266,7 +266,7 @@
 AXIS2_EXTERN axiom_children_qname_iterator_t* AXIS2_CALL
 axiom_soap_header_examine_all_header_blocks
 (axiom_soap_header_t* soap_header,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     axiom_element_t *om_ele = NULL;
 
@@ -289,7 +289,7 @@
 AXIS2_EXTERN axiom_children_with_specific_attribute_iterator_t *
 AXIS2_CALL axiom_soap_header_extract_header_blocks
 (axiom_soap_header_t *soap_header,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *role)
 {
     const axis2_char_t *localname = NULL;
@@ -344,7 +344,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_header_set_base_node(axiom_soap_header_t *soap_header,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_node_t *node)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -364,7 +364,7 @@
 
 AXIS2_EXTERN axiom_node_t* AXIS2_CALL
 axiom_soap_header_get_base_node(axiom_soap_header_t *soap_header,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return soap_header->om_ele_node;
@@ -375,7 +375,7 @@
 */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_header_get_soap_version(axiom_soap_header_t *soap_header,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return soap_header->soap_version;
@@ -383,7 +383,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_header_set_soap_version(axiom_soap_header_t *soap_header,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int soap_version)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -394,7 +394,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_header_set_header_block(axiom_soap_header_t *soap_header,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         struct axiom_soap_header_block *header_block)
 {
     axis2_char_t *key = NULL ;
@@ -428,7 +428,7 @@
 }
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_header_set_builder(axiom_soap_header_t *soap_header,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         struct axiom_soap_builder *builder)
 {
     AXIS2_PARAM_CHECK(env->error, builder, AXIS2_FAILURE);
@@ -440,7 +440,7 @@
 AXIS2_EXTERN axutil_array_list_t* AXIS2_CALL
 axiom_soap_header_get_header_blocks_with_namespace_uri
 (axiom_soap_header_t* soap_header,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         const axis2_char_t *ns_uri)
 {
     axutil_array_list_t *header_block_list = NULL;
@@ -516,14 +516,14 @@
 
 AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
 axiom_soap_header_get_all_header_blocks(axiom_soap_header_t *soap_header,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return soap_header->header_blocks;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_header_remove_header_block(axiom_soap_header_t *soap_header,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_qname_t *qname)
 {
     axis2_char_t *qn_localname = NULL;
@@ -578,7 +578,7 @@
 }
 
 static axis2_bool_t AXIS2_CALL
-axiom_soap_header_qname_matches(const axis2_env_t *env,
+axiom_soap_header_qname_matches(const axutil_env_t *env,
         axis2_qname_t *element_qname,
         axis2_qname_t *qname_to_match)
 {

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c Fri Mar 30 10:26:22 2007
@@ -31,7 +31,7 @@
 };
 
 AXIS2_EXTERN axiom_soap_header_block_t * AXIS2_CALL
-axiom_soap_header_block_create(const axis2_env_t *env)
+axiom_soap_header_block_create(const axutil_env_t *env)
 {
     axiom_soap_header_block_t *header_block = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -53,7 +53,7 @@
 
 
 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,
         axiom_soap_header_t *header)
@@ -92,7 +92,7 @@
 
 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_ENV_CHECK(env, void);
     AXIS2_FREE(env->allocator, header_block);
@@ -101,7 +101,7 @@
 
 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 *role_uri)
 {
     const axis2_char_t *attr_localname = NULL;
@@ -128,7 +128,7 @@
 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)
 {
     const axis2_char_t *attr_localname = NULL;
     const axis2_char_t *attr_nsuri     = NULL;
@@ -154,7 +154,7 @@
 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)
 {
     const axis2_char_t *attr_nsuri     = NULL;
@@ -189,7 +189,7 @@
 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)
 {
     const axis2_char_t *attr_nsuri     = NULL;
@@ -230,7 +230,7 @@
 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)
 {
     const axis2_char_t *must_understand = NULL;
     const axis2_char_t *attr_nsuri     = NULL;
@@ -270,7 +270,7 @@
 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)
@@ -347,7 +347,7 @@
 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)
 {
@@ -395,7 +395,7 @@
 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_ENV_CHECK(env, AXIS2_FAILURE);
     return header_block->processed;
@@ -404,7 +404,7 @@
 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_ENV_CHECK(env, AXIS2_FAILURE);
     header_block->processed = AXIS2_TRUE;
@@ -413,7 +413,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL axiom_soap_header_block_set_base_node
 (axiom_soap_header_block_t *header_block,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_node_t *node)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -432,7 +432,7 @@
 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_ENV_CHECK(env, NULL);
     return header_block->om_ele_node;
@@ -441,7 +441,7 @@
 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)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return header_block->soap_version;
@@ -450,7 +450,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_header_block_set_soap_version
 (axiom_soap_header_block_t *header_block,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         int soap_version)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/axiom/src/util/om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/util/om_util.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/util/om_util.c (original)
+++ webservices/axis2/trunk/c/axiom/src/util/om_util.c Fri Mar 30 10:26:22 2007
@@ -24,7 +24,7 @@
 
 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)
 {
@@ -66,7 +66,7 @@
 
 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)
 {
@@ -107,7 +107,7 @@
 
 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)
 {
@@ -119,7 +119,7 @@
 
 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)
 {
@@ -144,7 +144,7 @@
 
 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)
 {
@@ -167,7 +167,7 @@
 
 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)
@@ -229,7 +229,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)
@@ -270,7 +270,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)
@@ -307,7 +307,7 @@
 
 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,
@@ -392,7 +392,7 @@
 }
 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,
@@ -443,7 +443,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,
@@ -491,7 +491,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)
@@ -573,7 +573,7 @@
 
 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)
@@ -622,7 +622,7 @@
 
 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)
@@ -671,7 +671,7 @@
 
 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,
@@ -801,7 +801,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,
@@ -877,7 +877,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,
@@ -951,7 +951,7 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axiom_util_get_child_node_text(axiom_node_t *om_node,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     axiom_element_t *om_ele = NULL;
     if (!om_node)
@@ -974,7 +974,7 @@
 
 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)
 {
     axiom_element_t *om_ele = NULL;
 
@@ -997,7 +997,7 @@
 
 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)
 {
     axiom_element_t *om_ele = NULL;
     axiom_namespace_t *om_ns   = NULL;
@@ -1023,7 +1023,7 @@
 
 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)
 {
     axiom_element_t *first_ele = NULL;
@@ -1040,7 +1040,7 @@
 }
 
 AXIS2_EXTERN axiom_document_t *AXIS2_CALL
-axiom_util_new_document(const axis2_env_t *env,
+axiom_util_new_document(const axutil_env_t *env,
     const axis2_uri_t *uri)
 {
     axis2_char_t *path = NULL;

Modified: webservices/axis2/trunk/c/axiom/test/om/test_om.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/om/test_om.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/om/test_om.c (original)
+++ webservices/axis2/trunk/c/axiom/test/om/test_om.c Fri Mar 30 10:26:22 2007
@@ -27,14 +27,14 @@
 #include <axiom_xml_reader.h>
 #include <stdio.h>
 #include <axiom_xml_writer.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 /**
    Define the environment related variables globaly so that they are available
    for both functions
 */
 
 axutil_allocator_t *allocator = NULL;
-axis2_env_t *environment = NULL;
+axutil_env_t *environment = NULL;
 axis2_stream_t *stream = NULL;
 axis2_error_t *error = NULL;
 axis2_log_t *axis_log     = NULL;
@@ -309,11 +309,11 @@
     axis_log = axis2_log_create(allocator, NULL, NULL);
     error = axis2_error_create(allocator);
 
-    environment = axis2_env_create_with_error_log(allocator, error,  axis_log);
+    environment = axutil_env_create_with_error_log(allocator, error,  axis_log);
     test_om_build(file_name);
     test_om_serialize();
 
-    axis2_env_free(environment);
+    axutil_env_free(environment);
     return 0;
 }
 

Modified: webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/soap/test_soap.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/soap/test_soap.c (original)
+++ webservices/axis2/trunk/c/axiom/test/soap/test_soap.c Fri Mar 30 10:26:22 2007
@@ -69,7 +69,7 @@
     return AXIS2_TRUE;
 }
 
-int printnode(axiom_node_t *om_node, const axis2_env_t *env)
+int printnode(axiom_node_t *om_node, const axutil_env_t *env)
 {
     axiom_element_t *om_ele = NULL;
     axis2_char_t *localname = NULL;
@@ -102,7 +102,7 @@
     return 0;
 }
 
-int build_soap(const axis2_env_t *env, const char *filename, const axis2_char_t *uri)
+int build_soap(const axutil_env_t *env, const char *filename, const axis2_char_t *uri)
 {
     axiom_stax_builder_t *om_builder = NULL;
 
@@ -257,7 +257,7 @@
 }
 
 
-int build_soap_programatically(const axis2_env_t *env)
+int build_soap_programatically(const axutil_env_t *env)
 {
     axiom_soap_envelope_t *soap_envelope = NULL;
     axiom_soap_body_t *soap_body = NULL;
@@ -337,7 +337,7 @@
     return AXIS2_SUCCESS;
 }
 
-int create_soap_fault(const axis2_env_t *env)
+int create_soap_fault(const axutil_env_t *env)
 {
     axiom_soap_envelope_t *soap_envelope = NULL;
     axiom_soap_body_t *soap_body = NULL;
@@ -367,7 +367,7 @@
     return 0;
 }
 
-int test_soap_fault_value(const axis2_env_t *env)
+int test_soap_fault_value(const axutil_env_t *env)
 {
     axiom_soap_envelope_t *soap_envelope = NULL;
     axiom_soap_body_t *soap_body = NULL;
@@ -397,7 +397,7 @@
 }
 int main(int argc, char *argv[])
 {
-    axis2_env_t *env = NULL;
+    axutil_env_t *env = NULL;
     axutil_allocator_t *allocator = NULL;
     axis2_error_t *error = NULL;
     axis2_log_t *log = NULL;
@@ -416,13 +416,13 @@
     log = axis2_log_create(allocator, NULL, "test_soap.log");
     log->level = AXIS2_LOG_LEVEL_DEBUG;
     error = axis2_error_create(allocator);
-    env = axis2_env_create_with_error_log(allocator, error,  log);
+    env = axutil_env_create_with_error_log(allocator, error,  log);
 
     axis2_error_init();
     /*build_soap_programatically(env);   */
     build_soap(env, filename, uri);
     /*create_soap_fault(env);
     test_soap_fault_value(env); */
-    axis2_env_free(env);
+    axutil_env_free(env);
     return 0;
 }

Modified: webservices/axis2/trunk/c/guththila/include/guththila.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila.h Fri Mar 30 10:26:22 2007
@@ -33,7 +33,7 @@
 #include "guththila_unicode.h"
 #include "guththila_defines.h"
 
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axutil_allocator.h>
 #include <axis2_stack.h>
 #include <axis2_string.h>
@@ -97,16 +97,16 @@
 
 
 AXIS2_EXTERN int AXIS2_CALL
-guththila_read (axis2_env_t * environment,
+guththila_read (axutil_env_t * environment,
 				guththila_t * p);
                                 
 int AXIS2_CALL
-guththila_next_char (axis2_env_t *environment,
+guththila_next_char (axutil_env_t *environment,
 				     guththila_t * p,
 				     int eof);
 
 int AXIS2_CALL
-guththila_tokenize (axis2_env_t *environment,
+guththila_tokenize (axutil_env_t *environment,
 				    guththila_t * p);
                                         
                                         
@@ -114,335 +114,335 @@
 guththila_exception (guththila_char_t * s, int line, int error_code);
 
 int AXIS2_CALL
-guththila_skip_spaces (axis2_env_t *environment,
+guththila_skip_spaces (axutil_env_t *environment,
 				       guththila_t *p,
 				       int c);
                                            
 int AXIS2_CALL
-guththila_process_xml_decl(axis2_env_t *environment,
+guththila_process_xml_decl(axutil_env_t *environment,
 					   guththila_t * p);
                                             
 int AXIS2_CALL
-guththila_process_version_info(axis2_env_t * environment,
+guththila_process_version_info(axutil_env_t * environment,
                                                guththila_t * p);
                                                
                                                
 int AXIS2_CALL
-guththila_process_encoding_decl (axis2_env_t * environment,
+guththila_process_encoding_decl (axutil_env_t * environment,
                                                  guththila_t * p);
                                                  
 int AXIS2_CALL
-guththila_process_sd_decl (axis2_env_t *environment,
+guththila_process_sd_decl (axutil_env_t *environment,
                                            guththila_t *p);
                                            
 void AXIS2_CALL
-guththila_open_token (axis2_env_t *environment,
+guththila_open_token (axutil_env_t *environment,
                                       guththila_t *p);
                                       
 void AXIS2_CALL
-guththila_close_token (axis2_env_t *environment,
+guththila_close_token (axutil_env_t *environment,
                                        guththila_t *p,
                                        int t,
                                        int refer);
                                        
 guththila_char_t * AXIS2_CALL
-guththila_last_char (axis2_env_t *environment,
+guththila_last_char (axutil_env_t *environment,
                                      guththila_t *p);
                                      
 int AXIS2_CALL
-guththila_process_eq (axis2_env_t *environment,
+guththila_process_eq (axutil_env_t *environment,
                                       guththila_t *p,
                                       int c);
                                       
 void AXIS2_CALL
-guththila_add_attribute (axis2_env_t *environment,
+guththila_add_attribute (axutil_env_t *environment,
                                          guththila_t *p,
                                          guththila_token_t * name,
                                          guththila_token_t * value);
                                          
 void AXIS2_CALL
-guththila_add_attribute_with_prefix (axis2_env_t *environment,
+guththila_add_attribute_with_prefix (axutil_env_t *environment,
 						     guththila_t *p,
 						     guththila_token_t * prefix,
 						     guththila_token_t * name,
 						     guththila_token_t * value);
                                          
 int AXIS2_CALL
-guththila_process_char_data (axis2_env_t *environment,
+guththila_process_char_data (axutil_env_t *environment,
                                              guththila_t *p);
                                              
 int AXIS2_CALL
-guththila_process_space_tag_or_empty_element (axis2_env_t * environment,
+guththila_process_space_tag_or_empty_element (axutil_env_t * environment,
 							      guththila_t *p);
                                              
 int AXIS2_CALL
-guththila_process_comment (axis2_env_t *environment,
+guththila_process_comment (axutil_env_t *environment,
                                            guththila_t *p);
                                            
 int AXIS2_CALL
-guththila_process_pi (axis2_env_t *environment,
+guththila_process_pi (axutil_env_t *environment,
                                       guththila_t *p);
                                       
 int AXIS2_CALL
-guththila_process_end_tag (axis2_env_t *environment,
+guththila_process_end_tag (axutil_env_t *environment,
 					   guththila_t *p);
                                              
 void AXIS2_CALL
-guththila_reset (axis2_env_t *environment,
+guththila_reset (axutil_env_t *environment,
                                  guththila_t * p);
                                  
 int AXIS2_CALL
-guththila_process_name (axis2_env_t *environment,
+guththila_process_name (axutil_env_t *environment,
                                         guththila_t *p);
                                         
 int AXIS2_CALL
-guththila_process_attribute (axis2_env_t  *environment,
+guththila_process_attribute (axutil_env_t  *environment,
                                              guththila_t *p,
                                              int c);
                                              
 int AXIS2_CALL
-guththila_process_attribute_value (axis2_env_t * environment,
+guththila_process_attribute_value (axutil_env_t * environment,
 						   guththila_t * p,
 						   int c);
                                               
                                               
 int AXIS2_CALL
-guththila_is_space (axis2_env_t *environment, int c);
+guththila_is_space (axutil_env_t *environment, int c);
 
 
 /*void AXIS2_CALL
-guththila_relocate_tokens (axis2_env_t *environment,
+guththila_relocate_tokens (axutil_env_t *environment,
                                            guththila_t *p,
                                            int offset);*/
                                            
 void AXIS2_CALL
-guththila_shift (axis2_env_t *environment,
+guththila_shift (axutil_env_t *environment,
                                  guththila_t * p);
                                  
 void AXIS2_CALL
-guththila_add_namespace (axis2_env_t *environment,
+guththila_add_namespace (axutil_env_t *environment,
                                          guththila_t *p,
                                          guththila_token_t * name,
                                          guththila_token_t * uri);
                                          
 void AXIS2_CALL
-guththila_open_element (axis2_env_t *environment,
+guththila_open_element (axutil_env_t *environment,
                                         guththila_t *p);
                                         
 void AXIS2_CALL
-guththila_close_element (axis2_env_t *environment,
+guththila_close_element (axutil_env_t *environment,
                                          guththila_t *p);
                                          
 int AXIS2_CALL
-guththila_from_utf16 (axis2_env_t *environment,
+guththila_from_utf16 (axutil_env_t *environment,
                                       guththila_t *p,
                                       int eof);
                                       
 int AXIS2_CALL
-guththila_is_valid_starting_char (axis2_env_t * environment,
+guththila_is_valid_starting_char (axutil_env_t * environment,
 						  guththila_t * p,
 						  int c);
                                          
 
 AXIS2_EXTERN  int AXIS2_CALL
-guththila_next (axis2_env_t * environment,
+guththila_next (axutil_env_t * environment,
 				guththila_t * p);
                                 
 AXIS2_EXTERN guththila_t * AXIS2_CALL
-guththila_create (axis2_env_t * environment,
+guththila_create (axutil_env_t * environment,
 				  guththila_reader_t * r);
                                   
 AXIS2_EXTERN void AXIS2_CALL
-guththila_free (axis2_env_t * environment,
+guththila_free (axutil_env_t * environment,
 				guththila_t * parser);
                                
 AXIS2_EXTERN int AXIS2_CALL
-guththila_get_attribute_count (axis2_env_t * environment,
+guththila_get_attribute_count (axutil_env_t * environment,
 					       guththila_t *p);
                                  
                                  
 AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_get_attribute_name (axis2_env_t *environment,
+guththila_get_attribute_name (axutil_env_t *environment,
 					      guththila_t * p,
 					      guththila_attribute_t * att);
                                  
                                  
 AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_get_attribute_value (axis2_env_t *environment,
+guththila_get_attribute_value (axutil_env_t *environment,
 					       guththila_t *p,
 					       guththila_attribute_t * att);
                                  
                                  
 AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_get_attribute_prefix (axis2_env_t *environment,
+guththila_get_attribute_prefix (axutil_env_t *environment,
 						guththila_t *p,
 						guththila_attribute_t * att);
                                  
                                  
 AXIS2_EXTERN guththila_attribute_t * AXIS2_CALL
-guththila_get_attribute (axis2_env_t *environment,
+guththila_get_attribute (axutil_env_t *environment,
 					 guththila_t * p);
                                          
                                          
 AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_get_attribute_name_by_number (axis2_env_t * environment,
+guththila_get_attribute_name_by_number (axutil_env_t * environment,
 							guththila_t * p,
 							int i);
                                          
                                          
 AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_get_attribute_value_by_number (axis2_env_t * environment,
+guththila_get_attribute_value_by_number (axutil_env_t * environment,
 							 guththila_t * p,
 							 int i);
                                          
                                          
 AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_get_attribute_prefix_by_number (axis2_env_t * environment,
+guththila_get_attribute_prefix_by_number (axutil_env_t * environment,
 							  guththila_t * p,
 							  int i);
                                          
                                          
 AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_get_name (axis2_env_t * environment,
+guththila_get_name (axutil_env_t * environment,
 				    guththila_t * p);
                                     
                                     
 AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_get_prefix (axis2_env_t * environment,
+guththila_get_prefix (axutil_env_t * environment,
 				      guththila_t * p);
                                       
                                       
 AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_get_value (axis2_env_t * environment,
+guththila_get_value (axutil_env_t * environment,
 				     guththila_t * p);
                                      
                                      
 AXIS2_EXTERN guththila_namespace_t * AXIS2_CALL
-guththila_get_namespace (axis2_env_t *environment,
+guththila_get_namespace (axutil_env_t *environment,
 					 guththila_t * p);
                                          
                                          
 AXIS2_EXTERN int AXIS2_CALL
-guththila_get_namespace_count (axis2_env_t *environment,
+guththila_get_namespace_count (axutil_env_t *environment,
 					       guththila_t *p);
                                          
                                          
 AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_get_namespace_uri (axis2_env_t *environment,
+guththila_get_namespace_uri (axutil_env_t *environment,
 					     guththila_t * p,
 					     guththila_namespace_t * ns);
                                              
                                              
 AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_get_namespace_prefix (axis2_env_t *environment,
+guththila_get_namespace_prefix (axutil_env_t *environment,
 						guththila_t *p,
 						guththila_namespace_t * ns);
                                      
 
 AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_get_namespace_prefix_by_number (axis2_env_t * environment,
+guththila_get_namespace_prefix_by_number (axutil_env_t * environment,
 							  guththila_t * p,
 							  int i);
                                      
                                      
 AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_get_namespace_uri_by_number (axis2_env_t *environment,
+guththila_get_namespace_uri_by_number (axutil_env_t *environment,
 						       guththila_t * p,
 						       int i);
                                        
                                        
 AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_get_attribute_namespace_by_number (axis2_env_t * environment,
+guththila_get_attribute_namespace_by_number (axutil_env_t * environment,
 							     guththila_t * p,
 							     int i);
 
 AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_get_encoding (axis2_env_t *environment,
+guththila_get_encoding (axutil_env_t *environment,
 					guththila_t *p);
 
 /* --------------writer api --------------------------*/
 
 AXIS2_EXTERN void  AXIS2_CALL
-guththila_create_xml_stream_writer (axis2_env_t *environment, 
+guththila_create_xml_stream_writer (axutil_env_t *environment, 
 						    guththila_t *p, 
 						    char *fp);
 
 AXIS2_EXTERN void  AXIS2_CALL
-guththila_create_xml_stream_writer_for_memory (axis2_env_t *environment, 
+guththila_create_xml_stream_writer_for_memory (axutil_env_t *environment, 
 						    guththila_t *p);
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_write_to_buffer (axis2_env_t *env, 
+guththila_write_to_buffer (axutil_env_t *env, 
 					   guththila_t *p,
 					   const char *buff);
 
 
 void AXIS2_CALL
-guththila_close_start_element (axis2_env_t *environment,
+guththila_close_start_element (axutil_env_t *environment,
 					       guththila_t *p);
 
 
 void AXIS2_CALL
-guththila_close_depth_element (axis2_env_t *environment,
+guththila_close_depth_element (axutil_env_t *environment,
 					       guththila_t *p);
 
 
 void AXIS2_CALL
-guththila_check_name_validity (axis2_env_t *environment,
+guththila_check_name_validity (axutil_env_t *environment,
 					       guththila_t *p,
 					       char *start_element);
 
 
 void AXIS2_CALL
-guththila_open_depth_element (axis2_env_t *environment,
+guththila_open_depth_element (axutil_env_t *environment,
 					      guththila_t *p);
 
 
 void AXIS2_CALL
-guththila_do_write_attribute (axis2_env_t *environment, 
+guththila_do_write_attribute (axutil_env_t *environment, 
 					      guththila_t *p, 
 					      const char *local_name, 
 					      const char *value);
 
 
 int AXIS2_CALL
-guththila_check_default_namespace (axis2_env_t *env, 
+guththila_check_default_namespace (axutil_env_t *env, 
 						   guththila_t *p, 
 						   char *ns_uri);
 
 
 void AXIS2_CALL
-guththila_do_write_default_namespace (axis2_env_t *env, 
+guththila_do_write_default_namespace (axutil_env_t *env, 
 						      guththila_t *p, 
 						      char *ns_uri);
 
 
 int  AXIS2_CALL
-guththila_check_prefix_validity (axis2_env_t *env, 
+guththila_check_prefix_validity (axutil_env_t *env, 
 						 guththila_t *p, 
 						 char *prefix, 
 						 char *uri);
 
 AXIS2_EXTERN void  AXIS2_CALL
-guththila_write_namespace (axis2_env_t *env, 
+guththila_write_namespace (axutil_env_t *env, 
 					   guththila_t *p, 
 					   char *prefix, 
 					   char *uri);
 
 
 int  AXIS2_CALL
-guththila_check_xml_stream_writer (axis2_env_t *environment, 
+guththila_check_xml_stream_writer (axutil_env_t *environment, 
 						   guththila_t *p);
 
 
 void AXIS2_CALL
-guththila_do_write_namespace (axis2_env_t *env, 
+guththila_do_write_namespace (axutil_env_t *env, 
 					      guththila_t *p, 
 					      char *prefix, 
 					      char *uri);
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_do_write_attribute_with_prefix_and_namespace (axis2_env_t *env, 
+guththila_do_write_attribute_with_prefix_and_namespace (axutil_env_t *env, 
 									guththila_t *p,
 									const char *prefix, 
 									const char *namespace_uri,
@@ -451,18 +451,18 @@
 
 
 int AXIS2_CALL
-guththila_is_exsisting_prefix (axis2_env_t *env, 
+guththila_is_exsisting_prefix (axutil_env_t *env, 
 					       guththila_t *p, 
 					       const char *prefix);
 
 
 AXIS2_EXTERN void   AXIS2_CALL
-guththila_write_start_document (axis2_env_t *environment, 
+guththila_write_start_document (axutil_env_t *environment, 
 						guththila_t *p);
 
 
 void AXIS2_CALL
-guththila_do_write_attribute_with_prefix (axis2_env_t *env, 
+guththila_do_write_attribute_with_prefix (axutil_env_t *env, 
 							  guththila_t *p, 
 							  const char *prefix,
 							  const char *local_name, 
@@ -470,72 +470,72 @@
 
 
 AXIS2_EXTERN char * AXIS2_CALL
-guththila_get_prefix_for_namespace (axis2_env_t *env, 
+guththila_get_prefix_for_namespace (axutil_env_t *env, 
 						    guththila_t *p, 
 						    const char *namespace);
 
 
 
 AXIS2_EXTERN void   AXIS2_CALL
-guththila_write_start_element (axis2_env_t *environment, 
+guththila_write_start_element (axutil_env_t *environment, 
 						     guththila_t *p, 
 						     char *start_element);
 
 
 AXIS2_EXTERN void   AXIS2_CALL
-guththila_write_end_element (axis2_env_t *environment, 
+guththila_write_end_element (axutil_env_t *environment, 
 					     guththila_t *p);
 
 
 AXIS2_EXTERN void  AXIS2_CALL
-guththila_close (axis2_env_t *environment, 
+guththila_close (axutil_env_t *environment, 
 				 guththila_t *p);
 
 
 AXIS2_EXTERN void   AXIS2_CALL
-guththila_write_characters (axis2_env_t *environment, 
+guththila_write_characters (axutil_env_t *environment, 
 					    guththila_t *p,
 					    const char  *buff);
 
 
 AXIS2_EXTERN void   AXIS2_CALL
-guththila_write_comment (axis2_env_t *environment, 
+guththila_write_comment (axutil_env_t *environment, 
 					 guththila_t *p, 
 					 const char *buff);
 
 AXIS2_EXTERN void   AXIS2_CALL
-guththila_write_escape_character (axis2_env_t *environment, 
+guththila_write_escape_character (axutil_env_t *environment, 
 						  guththila_t *p, 
 						  const char *buff);
 
 
 AXIS2_EXTERN void   AXIS2_CALL
-guththila_write_empty_element (axis2_env_t *environment, 
+guththila_write_empty_element (axutil_env_t *environment, 
 					       guththila_t *p, 
 					       char *empty_element);
 
 
 AXIS2_EXTERN void  AXIS2_CALL
-guththila_write_default_namespace (axis2_env_t *environment, 
+guththila_write_default_namespace (axutil_env_t *environment, 
 						   guththila_t *p, 
 						   char *namespace_uri);
 
 
 AXIS2_EXTERN void  AXIS2_CALL
-guththila_write_namespace (axis2_env_t *environment, 
+guththila_write_namespace (axutil_env_t *environment, 
 					   guththila_t *p, 
 					   char *prefix, char *uri);
 
 
 AXIS2_EXTERN void   AXIS2_CALL
-guththila_write_attribute (axis2_env_t *environment, 
+guththila_write_attribute (axutil_env_t *environment, 
 					  guththila_t *p, 
 					  const char *localname, 
 					  const char *value);
 
 
 AXIS2_EXTERN void   AXIS2_CALL
-guththila_write_attribute_with_prefix_and_namespace (axis2_env_t *environment, 
+guththila_write_attribute_with_prefix_and_namespace (axutil_env_t *environment, 
 								     guththila_t *p,
 								     const char *prefix, 
 								     const char *namespace_uri,
@@ -543,42 +543,42 @@
 
 
 AXIS2_EXTERN void   AXIS2_CALL
-guththila_write_attribute_with_prefix (axis2_env_t *environment, 
+guththila_write_attribute_with_prefix (axutil_env_t *environment, 
 						       guththila_t *p,
 						       const char *prefix,
 						       const char *localname, const char *value);
 
 
 AXIS2_EXTERN void   AXIS2_CALL
-guththila_write_attribute_with_namespace (axis2_env_t *environment, 
+guththila_write_attribute_with_namespace (axutil_env_t *environment, 
 							  guththila_t *p,
 							  const char *namespace,
 							  const char *localname, const char *value);
 
 
 AXIS2_EXTERN void  AXIS2_CALL
-guththila_write_start_element_with_prefix_and_namespace (axis2_env_t *environment, 
+guththila_write_start_element_with_prefix_and_namespace (axutil_env_t *environment, 
 									 guththila_t *p, 
 									 const char* prefix,
 									 const char *namespace_uri, const char *local_name);
 
 
 AXIS2_EXTERN void  AXIS2_CALL
-guththila_write_start_element_with_namespace (axis2_env_t *environment, 
+guththila_write_start_element_with_namespace (axutil_env_t *environment, 
 							      guththila_t *p, 
 							      const char *namespace_uri, 
 							      const char *local_name);
 
 
 AXIS2_EXTERN void  AXIS2_CALL
-guththila_write_start_element_with_prefix (axis2_env_t *environment, 
+guththila_write_start_element_with_prefix (axutil_env_t *environment, 
 							   guththila_t *p, 
 							   const char *prefix, 
 							   const char *local_name);
 
 
 AXIS2_EXTERN void  AXIS2_CALL
-guththila_write_empty_element_with_prefix_and_namespace (axis2_env_t *environment, 
+guththila_write_empty_element_with_prefix_and_namespace (axutil_env_t *environment, 
 									 guththila_t *p, 
 									 const char* prefix,
 									 const char *namespace_uri, 
@@ -586,41 +586,41 @@
 
 
 AXIS2_EXTERN void  AXIS2_CALL
-guththila_write_empty_element_with_namespace (axis2_env_t *environment, 
+guththila_write_empty_element_with_namespace (axutil_env_t *environment, 
 							      guththila_t *p, 
 							      const char *namespace_uri, 
 							      const char *local_name);
 
 
 AXIS2_EXTERN void  AXIS2_CALL
-guththila_write_empty_element_with_prefix (axis2_env_t *environment, 
+guththila_write_empty_element_with_prefix (axutil_env_t *environment, 
 							   guththila_t *p, 
 							   const char *prefix, 
 							   const char *local_name);
 
 
 AXIS2_EXTERN void  AXIS2_CALL
-guththila_write_end_document (axis2_env_t *environment, 
+guththila_write_end_document (axutil_env_t *environment, 
 					      guththila_t *p);
 
 
 AXIS2_EXTERN void  AXIS2_CALL
-guththila_write_line (axis2_env_t *environment, 
+guththila_write_line (axutil_env_t *environment, 
 				      guththila_t *p, 
 				      char *element_name, 
 				      char *characters);
 
 AXIS2_EXTERN char * AXIS2_CALL
-guththila_get_memory_buffer (axis2_env_t *environemnt, 
+guththila_get_memory_buffer (axutil_env_t *environemnt, 
 					     guththila_t *p);
 
 AXIS2_EXTERN unsigned int AXIS2_CALL
-guththila_get_memory_buffer_size(axis2_env_t *env, 
+guththila_get_memory_buffer_size(axutil_env_t *env, 
 								 guththila_t *p);
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_xml_writer_free (axis2_env_t *environment,
+guththila_xml_writer_free (axutil_env_t *environment,
 					   guththila_t *t);
 
 #endif /* GUTHTHILA_XML_PULL_PARSER_H */

Modified: webservices/axis2/trunk/c/guththila/include/guththila_attribute.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_attribute.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_attribute.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_attribute.h Fri Mar 30 10:26:22 2007
@@ -31,7 +31,7 @@
 
 AXIS2_EXTERN guththila_attribute_t * AXIS2_CALL
 guththila_attribute_create (
-	axis2_env_t *env, 
+	axutil_env_t *env, 
 	guththila_token_t *prefix, 
 	guththila_token_t *name, 
 	guththila_token_t *value,
@@ -40,7 +40,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 guththila_attribute_free (
-	axis2_env_t *env,
+	axutil_env_t *env,
 	guththila_attribute_t *attribute);
 
 

Modified: webservices/axis2/trunk/c/guththila/include/guththila_buffer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_buffer.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_buffer.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_buffer.h Fri Mar 30 10:26:22 2007
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 /* #include "guththila_environment.h" */
 #include "guththila_defines.h"
-#include <axis2_env.h>
+#include <axutil_env.h>
 
 typedef struct guththila_buffer_s
 {
@@ -38,17 +38,17 @@
 #define GUTHTHILA_BUFFER_SIZE 1024
 
 AXIS2_EXTERN guththila_buffer_t * AXIS2_CALL
-guththila_buffer_create (axis2_env_t * environment, int size);
+guththila_buffer_create (axutil_env_t * environment, int size);
 
 AXIS2_EXTERN guththila_buffer_t *
-guththila_buffer_create_for_buffer (axis2_env_t * environment, char *buffer, int size);
+guththila_buffer_create_for_buffer (axutil_env_t * environment, char *buffer, int size);
 
 AXIS2_EXTERN void
-guththila_buffer_free (axis2_env_t * environment,
+guththila_buffer_free (axutil_env_t * environment,
                        guththila_buffer_t * name);
 
 AXIS2_EXTERN guththila_buffer_t *
-guththila_buffer_grow (axis2_env_t * environment,
+guththila_buffer_grow (axutil_env_t * environment,
                        guththila_buffer_t * name,
 					   int buffer_length);
 

Modified: webservices/axis2/trunk/c/guththila/include/guththila_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_reader.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_reader.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_reader.h Fri Mar 30 10:26:22 2007
@@ -25,7 +25,7 @@
 #include <string.h>
 #include "guththila_buffer.h"
 #include "guththila_defines.h"
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include "guththila_error.h"
 #include <axis2_utils.h>
 
@@ -56,28 +56,28 @@
 
 
 AXIS2_EXTERN guththila_reader_t * AXIS2_CALL
-guththila_reader_create_for_file (axis2_env_t * environment,
+guththila_reader_create_for_file (axutil_env_t * environment,
                                   char* filename);
 
 AXIS2_EXTERN guththila_reader_t * AXIS2_CALL 
-guththila_reader_create_for_io(axis2_env_t *environment,
+guththila_reader_create_for_io(axutil_env_t *environment,
 							   AXIS2_READ_INPUT_CALLBACK input_read_callback, void *ctx);
 
 AXIS2_EXTERN guththila_reader_t * AXIS2_CALL
-guththila_reader_create_for_memory(axis2_env_t *environment,
+guththila_reader_create_for_memory(axutil_env_t *environment,
                                    void *buffer,
                                     int size,
 				   void *ctx); 
 
 
 AXIS2_EXTERN int AXIS2_CALL
-guththila_reader_read (axis2_env_t * environment,
+guththila_reader_read (axutil_env_t * environment,
                        guththila_char_t * buffer, int offset, int length,
                        guththila_reader_t * r);
 
                        
 AXIS2_EXTERN void AXIS2_CALL
-guththila_reader_free (axis2_env_t * environment,
+guththila_reader_free (axutil_env_t * environment,
                        guththila_reader_t * r);
 
 #endif /* GUTHTHILA_READER_H */

Modified: webservices/axis2/trunk/c/guththila/include/guththila_token.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_token.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_token.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_token.h Fri Mar 30 10:26:22 2007
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_stack.h>
 #include <guththila_defines.h>
 
@@ -53,48 +53,48 @@
 
 
 AXIS2_EXTERN guththila_token_t *
-guththila_token_create_token_buffer (axis2_env_t * environment,
+guththila_token_create_token_buffer (axutil_env_t * environment,
                                      int size);
                                      
 AXIS2_EXTERN void
-guththila_token_free (axis2_env_t * environment,
+guththila_token_free (axutil_env_t * environment,
 					  guththila_token_t * tok);
 AXIS2_EXTERN int
-guththila_token_length (axis2_env_t * environment,
+guththila_token_length (axutil_env_t * environment,
                         guththila_token_t * tok);
                         
 AXIS2_EXTERN void
 guththila_token_exception ();
 
 AXIS2_EXTERN guththila_token_t *
-guththila_token_append (axis2_env_t * environment,
+guththila_token_append (axutil_env_t * environment,
                         guththila_token_t * tok);
                         
 AXIS2_EXTERN guththila_token_t *
-guththila_token_grow (axis2_env_t * environment,
+guththila_token_grow (axutil_env_t * environment,
                       guththila_token_t * tok);
                       
 AXIS2_EXTERN guththila_token_t *
-guththila_token_last (axis2_env_t * environment,
+guththila_token_last (axutil_env_t * environment,
                       guththila_token_t * tok);
                       
 AXIS2_EXTERN int
-guththila_token_count (axis2_env_t * environment,
+guththila_token_count (axutil_env_t * environment,
                        guththila_token_t * tok);
                        
 AXIS2_EXTERN guththila_char_t *
-guththila_token_to_string (axis2_env_t * environment,
+guththila_token_to_string (axutil_env_t * environment,
                            guththila_token_t * tok,
                            int unicode);
                            
 AXIS2_EXTERN void
-guththila_token_relocate (axis2_env_t * environment,
+guththila_token_relocate (axutil_env_t * environment,
                           guththila_token_t * tok,
                           int offset);
                           
                           
 AXIS2_EXTERN int
-guththila_token_compare (axis2_env_t * environment,
+guththila_token_compare (axutil_env_t * environment,
                          guththila_token_t * tok,
                          const guththila_char_t * st,
                          int n, 
@@ -102,26 +102,26 @@
                          
                          
 AXIS2_EXTERN guththila_char_t *
-guththila_token_convert_utf16_to_utf8 (axis2_env_t * environment,
+guththila_token_convert_utf16_to_utf8 (axutil_env_t * environment,
                                        guththila_char_t * buffer,
                                        int length);
                                        
 AXIS2_EXTERN int
-guththila_token_length_utf16 (axis2_env_t * environment,
+guththila_token_length_utf16 (axutil_env_t * environment,
                               unsigned int utf16_ch);
                               
                               
 AXIS2_EXTERN guththila_char_t *
-guththila_token_build_utf8 (axis2_env_t * environment,
+guththila_token_build_utf8 (axutil_env_t * environment,
                             unsigned int utf16_ch,
                             int length);
                             
 AXIS2_EXTERN guththila_char_t *
-guththila_token_char_ref (axis2_env_t * environment,
+guththila_token_char_ref (axutil_env_t * environment,
                           guththila_char_t * buffer);
                           
 AXIS2_EXTERN void AXIS2_CALL
-guththila_relocate_tokens(axis2_env_t *environment,
+guththila_relocate_tokens(axutil_env_t *environment,
 						  axis2_stack_t *stack,
 						  int offset);
 

Modified: webservices/axis2/trunk/c/guththila/include/guththila_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_writer.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_writer.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_writer.h Fri Mar 30 10:26:22 2007
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "guththila_buffer.h"
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include "guththila_defines.h"
 #include "guththila_error.h"
 
@@ -45,15 +45,15 @@
 }guththila_writer_impl_t; 
 
 AXIS2_EXTERN guththila_writer_t* AXIS2_CALL
-guththila_writer_create_for_file(axis2_env_t *env, 
+guththila_writer_create_for_file(axutil_env_t *env, 
     char *fp);
 
 AXIS2_EXTERN guththila_writer_t* AXIS2_CALL
-guththila_writer_create_for_memory (axis2_env_t *env);
+guththila_writer_create_for_memory (axutil_env_t *env);
 
 
 AXIS2_EXTERN int AXIS2_CALL
-guththila_writer_write(axis2_env_t *env, 
+guththila_writer_write(axutil_env_t *env, 
 		       char *buffer, 
 		       int offset, 
 		       int length, 
@@ -61,15 +61,15 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_writer_free (axis2_env_t *env, 
+guththila_writer_free (axutil_env_t *env, 
 		       guththila_writer_t *wt);
 
 AXIS2_EXTERN char * AXIS2_CALL
-guththila_writer_get_buffer (axis2_env_t *env, 
+guththila_writer_get_buffer (axutil_env_t *env, 
 		       guththila_writer_t *wt);
 
 AXIS2_EXTERN unsigned int AXIS2_CALL
-guththila_writer_get_buffer_size (axis2_env_t *env,
+guththila_writer_get_buffer_size (axutil_env_t *env,
 								  guththila_writer_t *wt);
 
 #endif	/* GUTHTHILA_WRITE_H */

Modified: webservices/axis2/trunk/c/guththila/include/guththila_xml_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_xml_writer.h?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_xml_writer.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_xml_writer.h Fri Mar 30 10:26:22 2007
@@ -20,7 +20,7 @@
 #define XML_STREAMWRITER_H
 #include "guththila_writer.h"
 #include "guththila_buffer.h"
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <axis2_stack.h>
 
 typedef struct guththila_xml_writer_s

Modified: webservices/axis2/trunk/c/guththila/samples/guththila_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/samples/guththila_main.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/samples/guththila_main.c (original)
+++ webservices/axis2/trunk/c/guththila/samples/guththila_main.c Fri Mar 30 10:26:22 2007
@@ -24,13 +24,13 @@
     int c;
     axutil_allocator_t *allocator;
     guththila_reader_t *red;
-    axis2_env_t *environment;
+    axutil_env_t *environment;
     guththila_t *parser;
     char *xml_buffer;
     allocator = axutil_allocator_init(NULL);
     xml_buffer = "<?xml version = \"1.0\"?><test a=\"din\">addddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd123</test>";
     environment =
-        axis2_env_create(allocator);
+        axutil_env_create(allocator);
 
     if (argc > 1)
         red = guththila_reader_create_for_file(environment, argv[1]);
@@ -187,6 +187,6 @@
     }
     guththila_reader_free(environment, red);
     guththila_free(environment, parser);
-    axis2_env_free(environment);
+    axutil_env_free(environment);
     return 0;
 }

Modified: webservices/axis2/trunk/c/guththila/samples/guththila_writer_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/samples/guththila_writer_main.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/samples/guththila_writer_main.c (original)
+++ webservices/axis2/trunk/c/guththila/samples/guththila_writer_main.c Fri Mar 30 10:26:22 2007
@@ -26,12 +26,12 @@
 {
     char *t;
     axutil_allocator_t *allocator;
-    axis2_env_t *env ;
+    axutil_env_t *env ;
     guththila_t *parser ;
 	char *xml = NULL;
 	FILE *file = NULL;
     allocator = axutil_allocator_init(NULL);
-    env = axis2_env_create(allocator);
+    env = axutil_env_create(allocator);
     parser = guththila_create(env, NULL);
 	guththila_create_xml_stream_writer_for_memory(env, parser);
 	guththila_write_start_element(env, parser, "two");
@@ -61,6 +61,6 @@
 	fclose (file);
     guththila_xml_writer_free(env, parser);
     guththila_free(env, parser);
-    axis2_env_free(env);
+    axutil_env_free(env);
     return 0;
 }

Modified: webservices/axis2/trunk/c/guththila/src/guththila_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_attribute.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_attribute.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_attribute.c Fri Mar 30 10:26:22 2007
@@ -3,7 +3,7 @@
 
 AXIS2_EXTERN guththila_attribute_t *AXIS2_CALL
 guththila_attribute_create (
-	axis2_env_t *env, 
+	axutil_env_t *env, 
 	guththila_token_t *prefix, 
 	guththila_token_t *name, 
 	guththila_token_t *value,
@@ -22,7 +22,7 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 guththila_attribute_free (
-	axis2_env_t *env,
+	axutil_env_t *env,
 	guththila_attribute_t *attribute)
 {
 	if (attribute)

Modified: webservices/axis2/trunk/c/guththila/src/guththila_buffer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_buffer.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_buffer.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_buffer.c Fri Mar 30 10:26:22 2007
@@ -19,11 +19,11 @@
 /* #include "guththila_environment.h" */
 #include <string.h>
 #include "guththila_buffer.h"
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include <stdio.h>
 
 AXIS2_EXTERN guththila_buffer_t * AXIS2_CALL
-guththila_buffer_create(axis2_env_t * environment, int size)
+guththila_buffer_create(axutil_env_t * environment, int size)
 {
     guththila_buffer_t *name;
     name = NULL;
@@ -48,7 +48,7 @@
 }
 
 AXIS2_EXTERN guththila_buffer_t *
-guththila_buffer_create_for_buffer(axis2_env_t * environment, char *buffer, int size)
+guththila_buffer_create_for_buffer(axutil_env_t * environment, char *buffer, int size)
 {
     guththila_buffer_t *name;
     name = NULL;
@@ -69,7 +69,7 @@
 }
 
 AXIS2_EXTERN void
-guththila_buffer_free(axis2_env_t * environment,
+guththila_buffer_free(axutil_env_t * environment,
         guththila_buffer_t * name)
 {
     if (name)
@@ -86,7 +86,7 @@
 
 
 AXIS2_EXTERN guththila_buffer_t *
-guththila_buffer_grow(axis2_env_t * environment,
+guththila_buffer_grow(axutil_env_t * environment,
 					  guththila_buffer_t * name,
 					  int buffer_length)
 {

Modified: webservices/axis2/trunk/c/guththila/src/guththila_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_reader.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_reader.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_reader.c Fri Mar 30 10:26:22 2007
@@ -24,7 +24,7 @@
 
 
 AXIS2_EXTERN guththila_reader_t * AXIS2_CALL
-guththila_reader_create_for_file(axis2_env_t * environment,
+guththila_reader_create_for_file(axutil_env_t * environment,
         char *filename)
 {
     guththila_reader_impl_t *file_reader = NULL;
@@ -52,7 +52,7 @@
 
 AXIS2_EXTERN guththila_reader_t * AXIS2_CALL
 guththila_reader_create_for_io(
-    axis2_env_t *environment,
+    axutil_env_t *environment,
     AXIS2_READ_INPUT_CALLBACK input_read_callback, void* ctx)
 {
     guththila_reader_impl_t *io_reader =
@@ -72,7 +72,7 @@
 
 AXIS2_EXTERN guththila_reader_t * AXIS2_CALL
 guththila_reader_create_for_memory(
-    axis2_env_t *environment,
+    axutil_env_t *environment,
     void *buffer,
     int size,
     void* ctx)
@@ -97,7 +97,7 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_reader_free(axis2_env_t * environment,
+guththila_reader_free(axutil_env_t * environment,
         guththila_reader_t * r)
 {
 
@@ -115,7 +115,7 @@
 
 
 AXIS2_EXTERN int AXIS2_CALL
-guththila_reader_read(axis2_env_t * environment,
+guththila_reader_read(axutil_env_t * environment,
         guththila_char_t * buffer,
         int offset,
         int length,

Modified: webservices/axis2/trunk/c/guththila/src/guththila_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_token.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_token.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_token.c Fri Mar 30 10:26:22 2007
@@ -24,7 +24,7 @@
 
 
 AXIS2_EXTERN guththila_token_t *
-guththila_token_create_token_buffer(axis2_env_t *environment,
+guththila_token_create_token_buffer(axutil_env_t *environment,
         int size)
 {
     guththila_token_t *tok =
@@ -36,7 +36,7 @@
 
 
 AXIS2_EXTERN void
-guththila_token_free (axis2_env_t * environment,
+guththila_token_free (axutil_env_t * environment,
 					  guththila_token_t * tok)
 {
     if (tok)
@@ -62,7 +62,7 @@
 
 
 AXIS2_EXTERN int
-guththila_token_length(axis2_env_t * environment,
+guththila_token_length(axutil_env_t * environment,
         guththila_token_t * tok)
 {
     if (tok->end)
@@ -74,7 +74,7 @@
 
 
 AXIS2_EXTERN guththila_token_t *
-guththila_token_grow(axis2_env_t * environment,
+guththila_token_grow(axutil_env_t * environment,
         guththila_token_t * tok)
 {
 	guththila_token_t *dest;
@@ -92,7 +92,7 @@
 
 
 AXIS2_EXTERN guththila_token_t *
-guththila_token_append(axis2_env_t * environment,
+guththila_token_append(axutil_env_t * environment,
         guththila_token_t * tok)
 {
     if (++(tok->last) > (tok->size))
@@ -102,7 +102,7 @@
 
 
 AXIS2_EXTERN guththila_token_t *
-guththila_token_last(axis2_env_t * environment,
+guththila_token_last(axutil_env_t * environment,
         guththila_token_t * tok)
 {
     if (tok->last < 0)
@@ -112,14 +112,14 @@
 
 
 AXIS2_EXTERN int
-guththila_token_count(axis2_env_t * environment,
+guththila_token_count(axutil_env_t * environment,
         guththila_token_t * tok)
 {
     return tok->last;
 }
 
 AXIS2_EXTERN guththila_char_t *
-guththila_token_char_ref(axis2_env_t * environment,
+guththila_token_char_ref(axutil_env_t * environment,
         guththila_char_t * buffer)
 {
     int len = 0;
@@ -183,7 +183,7 @@
 
 
 AXIS2_EXTERN guththila_char_t *
-guththila_token_to_string(axis2_env_t * environment,
+guththila_token_to_string(axutil_env_t * environment,
         guththila_token_t * tok, int unicode)
 {
     if (tok)
@@ -223,7 +223,7 @@
 
 
 AXIS2_EXTERN void
-guththila_token_relocate(axis2_env_t * environment,
+guththila_token_relocate(axutil_env_t * environment,
         guththila_token_t * tok, int offset)
 {
     tok->start -= offset;
@@ -232,7 +232,7 @@
 
 
 AXIS2_EXTERN int
-guththila_token_compare(axis2_env_t * environment,
+guththila_token_compare(axutil_env_t * environment,
         guththila_token_t * tok, const guththila_char_t * s,
         int n, int unicode_state)
 {
@@ -248,7 +248,7 @@
 
 
 AXIS2_EXTERN int
-guththila_token_length_utf16(axis2_env_t * environment,
+guththila_token_length_utf16(axutil_env_t * environment,
         unsigned int utf16_ch)
 {
     int length;
@@ -271,7 +271,7 @@
 
 
 AXIS2_EXTERN guththila_char_t *
-guththila_token_build_utf8(axis2_env_t * environment,
+guththila_token_build_utf8(axutil_env_t * environment,
         unsigned int utf16_ch, int length)
 {
     guththila_UTF8_char mask = 0;
@@ -320,7 +320,7 @@
 
 
 AXIS2_EXTERN guththila_char_t *
-guththila_token_convert_utf16_to_utf8(axis2_env_t * environment,
+guththila_token_convert_utf16_to_utf8(axutil_env_t * environment,
         guththila_char_t * buffer, int length)
 {
     unsigned int utf16_char = 0;
@@ -347,7 +347,7 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_relocate_tokens(axis2_env_t *environment,
+guththila_relocate_tokens(axutil_env_t *environment,
 						  axis2_stack_t *stack,
 						  int offset)
 {

Modified: webservices/axis2/trunk/c/guththila/src/guththila_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_writer.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_writer.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_writer.c Fri Mar 30 10:26:22 2007
@@ -19,7 +19,7 @@
 
 
 AXIS2_EXTERN guththila_writer_t * AXIS2_CALL
-guththila_writer_create_for_file(axis2_env_t *env, char *fp)
+guththila_writer_create_for_file(axutil_env_t *env, char *fp)
 {
     guththila_writer_impl_t *wt = NULL;
     if (!fp)
@@ -33,7 +33,7 @@
 }
 
 AXIS2_EXTERN guththila_writer_t * AXIS2_CALL
-guththila_writer_create_for_memory(axis2_env_t *env)
+guththila_writer_create_for_memory(axutil_env_t *env)
 {
     guththila_writer_impl_t *wt = NULL;
 
@@ -51,7 +51,7 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL
-guththila_writer_free(axis2_env_t *env, guththila_writer_t *wt)
+guththila_writer_free(axutil_env_t *env, guththila_writer_t *wt)
 {
     if (wt)
     {
@@ -73,7 +73,7 @@
 }
 
 AXIS2_EXTERN int AXIS2_CALL
-guththila_writer_write(axis2_env_t *env,
+guththila_writer_write(axutil_env_t *env,
 					   char *buffer, int offset,
 					   int length, guththila_writer_t *wt)
 {
@@ -106,7 +106,7 @@
 
 
 AXIS2_EXTERN char * AXIS2_CALL
-guththila_writer_get_buffer(axis2_env_t *env,
+guththila_writer_get_buffer(axutil_env_t *env,
         guththila_writer_t *wt)
 {
     guththila_writer_impl_t *writer_impl = NULL;
@@ -121,7 +121,7 @@
 }
 
 AXIS2_EXTERN unsigned int AXIS2_CALL
-guththila_writer_get_buffer_size (axis2_env_t *env,
+guththila_writer_get_buffer_size (axutil_env_t *env,
 								  guththila_writer_t *wt)
 {
 	guththila_writer_impl_t *writer_impl = NULL;

Modified: webservices/axis2/trunk/c/guththila/src/guththila_writer_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_writer_main.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_writer_main.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_writer_main.c Fri Mar 30 10:26:22 2007
@@ -22,7 +22,7 @@
 int main()
 {
     axutil_allocator_t *allocator = axutil_allocator_init(NULL);
-    axis2_env_t *env = axis2_env_create(allocator);
+    axutil_env_t *env = axutil_env_create(allocator);
     guththila_t *parser = guththila_create(env, NULL);
     guththila_create_xml_stream_writer(env, parser, "w.xml");
     guththila_write_start_document(env, parser);
@@ -44,6 +44,6 @@
     guththila_xml_writer_free(env, parser);
     guththila_free(env, parser);
     axutil_allocator_free(allocator);
-    axis2_env_free(env);
+    axutil_env_free(env);
     return 0;
 }

Modified: webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c Fri Mar 30 10:26:22 2007
@@ -18,7 +18,7 @@
 #include <guththila.h>
 
 AXIS2_EXTERN guththila_t * AXIS2_CALL
-guththila_create(axis2_env_t * environment,
+guththila_create(axutil_env_t * environment,
 				 guththila_reader_t * r)
 {
     guththila_t *parser =
@@ -65,7 +65,7 @@
 
 
 AXIS2_EXTERN  void AXIS2_CALL
-guththila_free(axis2_env_t * environment,
+guththila_free(axutil_env_t * environment,
 			   guththila_t * parser)
 {
 	int ii = 0;
@@ -164,7 +164,7 @@
 
 
 void AXIS2_CALL
-guththila_shift(axis2_env_t * environment,
+guththila_shift(axutil_env_t * environment,
 				guththila_t * parser)
 {
     memmove(parser->buffer->buff, parser->buffer->buff + (parser->offset),
@@ -176,7 +176,7 @@
 
 
 AXIS2_EXTERN int AXIS2_CALL
-guththila_read(axis2_env_t * environment,
+guththila_read(axutil_env_t * environment,
 			   guththila_t * parser)
 {
     int c = 0;
@@ -211,7 +211,7 @@
 
 
 int AXIS2_CALL
-guththila_from_utf16(axis2_env_t * environment,
+guththila_from_utf16(axutil_env_t * environment,
 					 guththila_t * parser,
 					 int eof)
 {
@@ -231,7 +231,7 @@
 
 
 int AXIS2_CALL
-guththila_next_char(axis2_env_t * environment,
+guththila_next_char(axutil_env_t * environment,
 					guththila_t * parser,
 					int eof)
 {
@@ -291,7 +291,7 @@
 
 
 guththila_char_t * AXIS2_CALL
-guththila_last_char(axis2_env_t * environment,
+guththila_last_char(axutil_env_t * environment,
 					guththila_t * parser)
 {
     return parser->buffer->buff + (parser->_next - 1);
@@ -299,7 +299,7 @@
 
 
 void AXIS2_CALL
-guththila_open_token(axis2_env_t * environment,
+guththila_open_token(axutil_env_t * environment,
 					 guththila_t * parser)
 {
     guththila_token_t *t =
@@ -312,7 +312,7 @@
 
 
 void AXIS2_CALL
-guththila_close_token(axis2_env_t * environment,
+guththila_close_token(axutil_env_t * environment,
 					  guththila_t * parser,
 					  int t, int refer)
 {
@@ -326,7 +326,7 @@
 
 
 int AXIS2_CALL
-guththila_skip_spaces(axis2_env_t * environment,
+guththila_skip_spaces(axutil_env_t * environment,
 					  guththila_t * parser,
 					  int c)
 {
@@ -337,7 +337,7 @@
 
 
 int AXIS2_CALL
-guththila_process_eq(axis2_env_t * environment,
+guththila_process_eq(axutil_env_t * environment,
 					 guththila_t * parser,
 					 int c)
 {
@@ -356,7 +356,7 @@
 
 
 int AXIS2_CALL
-guththila_process_version_info(axis2_env_t *
+guththila_process_version_info(axutil_env_t *
 							   environment,
 							   guththila_t *
 							   parser)
@@ -410,7 +410,7 @@
 
 
 int AXIS2_CALL
-guththila_process_encoding_decl(axis2_env_t *
+guththila_process_encoding_decl(axutil_env_t *
 								environment,
 								guththila_t *
 								parser)
@@ -450,7 +450,7 @@
 
 
 int AXIS2_CALL
-guththila_process_sd_decl(axis2_env_t *
+guththila_process_sd_decl(axutil_env_t *
 						  environment,
 						  guththila_t *
 						  parser)
@@ -508,7 +508,7 @@
 
 
 int AXIS2_CALL
-guththila_process_xml_decl(axis2_env_t *
+guththila_process_xml_decl(axutil_env_t *
 						   environment,
 						   guththila_t *
 						   parser)
@@ -550,7 +550,7 @@
 
 
 void AXIS2_CALL
-guththila_reset(axis2_env_t * environment,
+guththila_reset(axutil_env_t * environment,
 				guththila_t * parser)
 {
     int ii;
@@ -600,7 +600,7 @@
 
 
 int AXIS2_CALL
-guththila_is_space(axis2_env_t * environment,
+guththila_is_space(axutil_env_t * environment,
 				   int c)
 {
     if (0x20 == c || 0xD == c || 0xA == c || 0x9 == c)
@@ -611,7 +611,7 @@
 
 
 int AXIS2_CALL
-guththila_is_valid_starting_char(axis2_env_t *
+guththila_is_valid_starting_char(axutil_env_t *
 								 environment,
 								 guththila_t
 								 * parser, int c)
@@ -624,7 +624,7 @@
 
 
 int AXIS2_CALL
-guththila_process_name(axis2_env_t * environment,
+guththila_process_name(axutil_env_t * environment,
 					   guththila_t * parser)
 {
     int c;
@@ -657,7 +657,7 @@
 
 
 int AXIS2_CALL
-guththila_process_attribute_value(axis2_env_t *
+guththila_process_attribute_value(axutil_env_t *
 								  environment,
 								  guththila_t
 								  * parser, int quote)
@@ -687,7 +687,7 @@
 
 
 int AXIS2_CALL
-guththila_process_attribute(axis2_env_t *
+guththila_process_attribute(axutil_env_t *
 							environment,
 							guththila_t *
 							parser, int c)
@@ -703,7 +703,7 @@
 
 
 int AXIS2_CALL
-guththila_processSTagOrEmptyElem(axis2_env_t *
+guththila_processSTagOrEmptyElem(axutil_env_t *
 								 environment,
 								 guththila_t
 								 * parser)
@@ -737,7 +737,7 @@
 
 
 int AXIS2_CALL
-guththila_process_char_data(axis2_env_t *
+guththila_process_char_data(axutil_env_t *
 							environment,
 							guththila_t *
 							parser)
@@ -794,7 +794,7 @@
 
 
 int AXIS2_CALL
-guththila_process_end_tag(axis2_env_t *
+guththila_process_end_tag(axutil_env_t *
 						  environment,
 						  guththila_t *
 						  parser)
@@ -812,7 +812,7 @@
 
 
 int AXIS2_CALL
-guththila_process_pi(axis2_env_t * environment,
+guththila_process_pi(axutil_env_t * environment,
 					 guththila_t * parser)
 {
     int c;
@@ -825,7 +825,7 @@
 
 
 int AXIS2_CALL
-guththila_process_comment(axis2_env_t *
+guththila_process_comment(axutil_env_t *
 						  environment,
 						  guththila_t *
 						  parser)
@@ -876,7 +876,7 @@
 
 
 int AXIS2_CALL
-guththila_tokenize(axis2_env_t * environment,
+guththila_tokenize(axutil_env_t * environment,
 				   guththila_t * parser)
 {
     do
@@ -970,7 +970,7 @@
 
 
 AXIS2_EXTERN  int AXIS2_CALL
-guththila_next(axis2_env_t * environment,
+guththila_next(axutil_env_t * environment,
 			   guththila_t * parser)
 {
     int ix;
@@ -1120,7 +1120,7 @@
 
 
 void AXIS2_CALL
-guththila_open_element(axis2_env_t * environment,
+guththila_open_element(axutil_env_t * environment,
 					   guththila_t * parser)
 {
     int ii;
@@ -1150,7 +1150,7 @@
 
 
 void AXIS2_CALL
-guththila_close_element(axis2_env_t *
+guththila_close_element(axutil_env_t *
 						environment,
 						guththila_t * parser)
 {
@@ -1180,7 +1180,7 @@
 
 
 void AXIS2_CALL
-guththila_add_attribute(axis2_env_t *
+guththila_add_attribute(axutil_env_t *
 						environment,
 						guththila_t * parser,
 						guththila_token_t * name,
@@ -1193,7 +1193,7 @@
 
 
 void AXIS2_CALL
-guththila_add_attribute_with_prefix(axis2_env_t *
+guththila_add_attribute_with_prefix(axutil_env_t *
 									environment,
 									guththila_t
 									* parser,
@@ -1209,7 +1209,7 @@
 }
 
 void AXIS2_CALL
-guththila_add_namespace(axis2_env_t *
+guththila_add_namespace(axutil_env_t *
 						environment,
 						guththila_t * parser,
 						guththila_token_t * name,
@@ -1231,7 +1231,7 @@
 
 
 AXIS2_EXTERN  int AXIS2_CALL
-guththila_get_attribute_count(axis2_env_t *
+guththila_get_attribute_count(axutil_env_t *
 							  environment,
 							  guththila_t *
 							  parser)
@@ -1241,7 +1241,7 @@
 
 
 AXIS2_EXTERN  guththila_attribute_t * AXIS2_CALL
-guththila_get_attribute(axis2_env_t *
+guththila_get_attribute(axutil_env_t *
 						environment,
 						guththila_t * parser)
 {
@@ -1255,7 +1255,7 @@
 
 
 AXIS2_EXTERN  guththila_char_t * AXIS2_CALL
-guththila_get_attribute_name(axis2_env_t *
+guththila_get_attribute_name(axutil_env_t *
 							 environment,
 							 guththila_t *
 							 parser,
@@ -1271,7 +1271,7 @@
 
 
 AXIS2_EXTERN  guththila_char_t * AXIS2_CALL
-guththila_get_attribute_value(axis2_env_t *
+guththila_get_attribute_value(axutil_env_t *
 							  environment,
 							  guththila_t *
 							  parser,
@@ -1287,7 +1287,7 @@
 
 
 AXIS2_EXTERN  guththila_char_t * AXIS2_CALL
-guththila_get_attribute_prefix(axis2_env_t *
+guththila_get_attribute_prefix(axutil_env_t *
 							   environment,
 							   guththila_t *
 							   parser,
@@ -1303,7 +1303,7 @@
 
 
 AXIS2_EXTERN  guththila_char_t * AXIS2_CALL
-guththila_get_attribute_prefix_by_number(axis2_env_t * environment, guththila_t * parser, int i)
+guththila_get_attribute_prefix_by_number(axutil_env_t * environment, guththila_t * parser, int i)
 {
     int ix = axis2_stack_size(parser->attrib, environment);
     guththila_attribute_t *attribute = NULL;
@@ -1319,7 +1319,7 @@
 
 
 AXIS2_EXTERN  guththila_char_t * AXIS2_CALL
-guththila_get_attribute_name_by_number(axis2_env_t * environment, guththila_t * parser, int i)
+guththila_get_attribute_name_by_number(axutil_env_t * environment, guththila_t * parser, int i)
 {
     int ix = axis2_stack_size(parser->attrib, environment);
     guththila_attribute_t *attribute = NULL;
@@ -1335,7 +1335,7 @@
 
 
 AXIS2_EXTERN  guththila_char_t * AXIS2_CALL
-guththila_get_attribute_value_by_number(axis2_env_t * environment,
+guththila_get_attribute_value_by_number(axutil_env_t * environment,
 										guththila_t * parser, int i)
 {
     int ix = axis2_stack_size(parser->attrib, environment);
@@ -1352,7 +1352,7 @@
 
 
 AXIS2_EXTERN  guththila_char_t * AXIS2_CALL
-guththila_get_name(axis2_env_t * environment,
+guththila_get_name(axutil_env_t * environment,
 				   guththila_t * parser)
 {
     if (parser->name->end)
@@ -1363,7 +1363,7 @@
 
 
 AXIS2_EXTERN  guththila_char_t * AXIS2_CALL
-guththila_get_value(axis2_env_t * environment,
+guththila_get_value(axutil_env_t * environment,
 					guththila_t * parser)
 {
     if (parser->value->end)
@@ -1375,7 +1375,7 @@
 
 
 AXIS2_EXTERN  guththila_char_t * AXIS2_CALL
-guththila_get_prefix(axis2_env_t * environment,
+guththila_get_prefix(axutil_env_t * environment,
 					 guththila_t * parser)
 {
     if (parser->prefix)
@@ -1387,7 +1387,7 @@
 
 AXIS2_EXTERN  int AXIS2_CALL
 guththila_get_namespace_count(
-	axis2_env_t *
+	axutil_env_t *
 	environment,
 	guththila_t *
 	parser)
@@ -1401,7 +1401,7 @@
 
 AXIS2_EXTERN  guththila_namespace_t * AXIS2_CALL
 guththila_get_namespace(
-	axis2_env_t * environment,
+	axutil_env_t * environment,
 	guththila_t * parser)
 {
     guththila_namespace_t *namespace;
@@ -1414,7 +1414,7 @@
 
 
 AXIS2_EXTERN  guththila_char_t * AXIS2_CALL
-guththila_get_namespace_prefix(axis2_env_t *
+guththila_get_namespace_prefix(axutil_env_t *
 							   environment,
 							   guththila_t *
 							   parser,
@@ -1428,7 +1428,7 @@
 
 
 AXIS2_EXTERN  guththila_char_t * AXIS2_CALL
-guththila_get_namespace_uri(axis2_env_t *
+guththila_get_namespace_uri(axutil_env_t *
 							environment,
 							guththila_t *
 							parser,
@@ -1442,7 +1442,7 @@
 
 
 AXIS2_EXTERN  guththila_char_t * AXIS2_CALL
-guththila_get_namespace_prefix_by_number(axis2_env_t * environment,
+guththila_get_namespace_prefix_by_number(axutil_env_t * environment,
 										 guththila_t * parser,
 										 int i)
 {
@@ -1459,7 +1459,7 @@
 
 
 AXIS2_EXTERN  guththila_char_t * AXIS2_CALL
-guththila_get_namespace_uri_by_number(axis2_env_t
+guththila_get_namespace_uri_by_number(axutil_env_t
 									  * environment,
 									  guththila_t
 									  * parser, int i)
@@ -1477,7 +1477,7 @@
 
 
 AXIS2_EXTERN  guththila_char_t * AXIS2_CALL
-guththila_get_attribute_namespace_by_number(axis2_env_t * environment,
+guththila_get_attribute_namespace_by_number(axutil_env_t * environment,
 											guththila_t * parser,
 											int i)
 {
@@ -1507,7 +1507,7 @@
 }
 
 AXIS2_EXTERN  guththila_char_t * AXIS2_CALL
-guththila_get_encoding(axis2_env_t *environment,
+guththila_get_encoding(axutil_env_t *environment,
 					   guththila_t *parser)
 {
     /* parser will find character encoding base on Byte Order Mark



---------------------------------------------------------------------
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