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 [42/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/ gu...

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c Fri Mar 30 10:26:22 2007
@@ -48,42 +48,42 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_list_free(void *simple_type_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_simple_type_content_t *AXIS2_CALL
 xml_schema_simple_type_list_get_base_impl(void *simple_type_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_hash_t* AXIS2_CALL
 xml_schema_simple_type_list_super_objs(void *simple_type_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_simple_type_list_get_type(void *simple_type_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_simple_type_t* AXIS2_CALL
 xml_schema_simple_type_list_get_item_type(void *simple_type_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_list_set_item_type(void *simple_type_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         xml_schema_simple_type_t *base_type);
 
 axis2_qname_t* AXIS2_CALL
 xml_schema_simple_type_list_get_item_type_name(void *simple_type_list,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_list_set_item_type_name(void *simple_type_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_qname_t *base_type_name);
 
 /*************** function prototypes *****************************************/
 
 AXIS2_EXTERN xml_schema_simple_type_list_t * AXIS2_CALL
-xml_schema_simple_type_list_create(const axis2_env_t *env)
+xml_schema_simple_type_list_create(const axutil_env_t *env)
 {
     xml_schema_simple_type_list_impl_t *simple_type_list_impl = NULL;
     xml_schema_annotated_t *annotated = NULL;
@@ -188,7 +188,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_list_free(void *simple_type_list,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_simple_type_list_impl_t *simple_type_list_impl = NULL;
 
@@ -230,7 +230,7 @@
 
 xml_schema_simple_type_content_t *AXIS2_CALL
 xml_schema_simple_type_list_get_base_impl(void *simple_type_list,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_simple_type_list_impl_t *simple_type_list_impl = NULL;
 
@@ -244,7 +244,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 xml_schema_simple_type_list_resolve_methods(
                     xml_schema_simple_type_list_t *simple_type_list,
-                    const axis2_env_t *env,
+                    const axutil_env_t *env,
                     xml_schema_simple_type_list_t *simple_type_list_impl,
                     axis2_hash_t *methods)
 {
@@ -288,7 +288,7 @@
 */
 xml_schema_simple_type_t* AXIS2_CALL
 xml_schema_simple_type_list_get_item_type(void *simple_type_list,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return
@@ -297,7 +297,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_list_set_item_type(void *simple_type_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         xml_schema_simple_type_t* item_type)
 {
     xml_schema_simple_type_list_impl_t *sim_type_res_impl = NULL;
@@ -314,7 +314,7 @@
 
 axis2_qname_t* AXIS2_CALL
 xml_schema_simple_type_list_get_item_type_name(void *simple_type_list,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(simple_type_list)->item_type_name;
@@ -322,7 +322,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_list_set_item_type_name(void *simple_type_list,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_qname_t *item_type_name)
 {
     xml_schema_simple_type_list_impl_t *sim_type_res_impl = NULL;
@@ -341,14 +341,14 @@
 
 axis2_hash_t* AXIS2_CALL
 xml_schema_simple_type_list_super_objs(void *simple_type_list,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(simple_type_list)->ht_super;
 }
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_simple_type_list_get_type(void *simple_type_list,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(simple_type_list)->obj_type;
 }

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c Fri Mar 30 10:26:22 2007
@@ -50,46 +50,46 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_restriction_free(void *simple_type_restriction,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_simple_type_content_t *AXIS2_CALL
 xml_schema_simple_type_restriction_get_base_impl(void *simple_type_restriction,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_simple_type_t* AXIS2_CALL
 xml_schema_simple_type_restriction_get_base_type(void *simple_type_restriction,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_simple_type_restriction_get_type(void *simple_type_restriction,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_hash_t* AXIS2_CALL
 xml_schema_simple_type_restriction_super_objs(void *simple_type_restriction,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_restriction_set_base_type(void *simple_type_restriction,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         xml_schema_simple_type_t *base_type);
 
 axis2_qname_t* AXIS2_CALL
 xml_schema_simple_type_restriction_get_base_type_name(void *simple_type_restriction,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_restriction_set_base_type_name(void *simple_type_restriction,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_qname_t *base_type_name);
 
 xml_schema_obj_collection_t* AXIS2_CALL
 xml_schema_simple_type_restriction_get_facets(void *simple_type_restriction,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 /*************** function prototypes *****************************************/
 
 AXIS2_EXTERN xml_schema_simple_type_restriction_t * AXIS2_CALL
-xml_schema_simple_type_restriction_create(const axis2_env_t *env)
+xml_schema_simple_type_restriction_create(const axutil_env_t *env)
 {
     xml_schema_simple_type_restriction_impl_t *simple_type_restriction_impl = NULL;
     xml_schema_annotated_t *annotated = NULL;
@@ -202,7 +202,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_restriction_free(void *simple_type_restriction,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_simple_type_restriction_impl_t *simple_type_restriction_impl = NULL;
 
@@ -247,7 +247,7 @@
 
 xml_schema_simple_type_content_t *AXIS2_CALL
 xml_schema_simple_type_restriction_get_base_impl(void *simple_type_restriction,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_simple_type_restriction_impl_t *simple_type_restriction_impl = NULL;
 
@@ -261,7 +261,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 xml_schema_simple_type_restriction_resolve_methods(
                     xml_schema_simple_type_restriction_t *simple_type_restriction,
-                    const axis2_env_t *env,
+                    const axutil_env_t *env,
                     xml_schema_simple_type_restriction_t *simple_type_restriction_impl,
                     axis2_hash_t *methods)
 {
@@ -308,7 +308,7 @@
 */
 xml_schema_simple_type_t* AXIS2_CALL
 xml_schema_simple_type_restriction_get_base_type(void *simple_type_restriction,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return
@@ -317,7 +317,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_restriction_set_base_type(void *simple_type_restriction,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         xml_schema_simple_type_t* base_type)
 {
     xml_schema_simple_type_restriction_impl_t *sim_type_res_impl = NULL;
@@ -336,7 +336,7 @@
 
 axis2_qname_t* AXIS2_CALL
 xml_schema_simple_type_restriction_get_base_type_name(void *simple_type_restriction,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(simple_type_restriction)->base_type_name;
@@ -344,7 +344,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_restriction_set_base_type_name(void *simple_type_restriction,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_qname_t *base_type_name)
 {
     xml_schema_simple_type_restriction_impl_t *sim_type_res_impl = NULL;
@@ -363,7 +363,7 @@
 
 xml_schema_obj_collection_t* AXIS2_CALL
 xml_schema_simple_type_restriction_get_facets(void *simple_type_restriction,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_simple_type_restriction_impl_t *sim_type_res_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -373,14 +373,14 @@
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_simple_type_restriction_get_type(void *simple_type_restriction,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(simple_type_restriction)->obj_type;
 }
 
 axis2_hash_t* AXIS2_CALL
 xml_schema_simple_type_restriction_super_objs(void *simple_type_restriction,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(simple_type_restriction)->ht_super;
 }

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c Fri Mar 30 10:26:22 2007
@@ -49,51 +49,51 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_union_free(void *simple_type_union,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_simple_type_union_get_type(void *simple_type_union,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_hash_t *AXIS2_CALL
 xml_schema_simple_type_union_super_objs(void *simple_type_union,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
 xml_schema_simple_type_content_t *AXIS2_CALL
 xml_schema_simple_type_union_get_base_impl(void *simple_type_union,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
 xml_schema_obj_collection_t* AXIS2_CALL
 xml_schema_simple_type_union_get_base_types(void *simple_type_union,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_union_set_member_types_source(void *simple_type_union,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *member_types_source);
 
 axis2_char_t* AXIS2_CALL
 xml_schema_simple_type_union_get_member_types_source
 (void *simple_type_union,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axutil_array_list_t* AXIS2_CALL
 xml_schema_simple_type_union_get_member_types_qnames(
     void *simple_type_union,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_union_set_member_types_qnames(
     void *simple_type_union,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axutil_array_list_t *qns);
 
 /*************** function prototypes *****************************************/
 
 AXIS2_EXTERN xml_schema_simple_type_union_t * AXIS2_CALL
-xml_schema_simple_type_union_create(const axis2_env_t *env)
+xml_schema_simple_type_union_create(const axutil_env_t *env)
 {
     xml_schema_simple_type_union_impl_t *simple_type_union_impl = NULL;
     xml_schema_annotated_t *annotated = NULL;
@@ -214,7 +214,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_union_free(void *simple_type_union,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_simple_type_union_impl_t *simple_type_union_impl = NULL;
 
@@ -257,7 +257,7 @@
 
 xml_schema_simple_type_content_t *AXIS2_CALL
 xml_schema_simple_type_union_get_base_impl(void *simple_type_union,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_simple_type_union_impl_t *simple_type_union_impl = NULL;
 
@@ -271,7 +271,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 xml_schema_simple_type_union_resolve_methods(
                     xml_schema_simple_type_union_t *simple_type_union,
-                    const axis2_env_t *env,
+                    const axutil_env_t *env,
                     xml_schema_simple_type_union_t *simple_type_union_impl,
                     axis2_hash_t *methods)
 {
@@ -316,7 +316,7 @@
 
 xml_schema_obj_collection_t* AXIS2_CALL
 xml_schema_simple_type_union_get_base_types(void *simple_type_union,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return
@@ -325,7 +325,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_union_set_member_types_source(void *simple_type_union,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *member_types_source)
 
 {
@@ -346,7 +346,7 @@
 axis2_char_t* AXIS2_CALL
 xml_schema_simple_type_union_get_member_types_source
 (void *simple_type_union,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(simple_type_union)->member_types_source;
@@ -355,7 +355,7 @@
 
 axutil_array_list_t* AXIS2_CALL
 xml_schema_simple_type_union_get_member_types_qnames(void *simple_type_union,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_simple_type_union_impl_t *sim_type_res_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -364,14 +364,14 @@
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_simple_type_union_get_type(void *simple_type_union,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(simple_type_union)->obj_type;
 }
 
 axis2_hash_t *AXIS2_CALL
 xml_schema_simple_type_union_super_objs(void *simple_type_union,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(simple_type_union)->ht_super;
 }
@@ -379,7 +379,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_union_set_member_types_qnames(
     void *simple_type_union,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axutil_array_list_t *qns)
 {
     xml_schema_simple_type_union_impl_t *sim_type_union_impl = NULL;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c Fri Mar 30 10:26:22 2007
@@ -67,71 +67,71 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_type_free(void *type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_annotated_t *AXIS2_CALL
 xml_schema_type_get_base_impl(void *type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_type_get_type(void *type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_hash_t*  AXIS2_CALL
 xml_schema_type_super_objs(void *type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 void *AXIS2_CALL
 xml_schema_type_get_base_schema_type(void *type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_data_type_t *AXIS2_CALL
 xml_schema_type_get_data_type(void *type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_derivation_method_t *AXIS2_CALL
 xml_schema_type_get_derive_by(void *type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_derivation_method_t *AXIS2_CALL
 xml_schema_type_get_final(void *type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_type_set_final(void *type,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         xml_schema_derivation_method_t *final_derivation);
 
 xml_schema_derivation_method_t *AXIS2_CALL
 xml_schema_type_get_final_resolved(void *type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_bool_t AXIS2_CALL
 xml_schema_type_is_mixed(void *type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_type_set_mixed(void *type,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_bool_t is_mixed);
 
 axis2_char_t *AXIS2_CALL
 xml_schema_type_get_name(void *type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_type_set_name(void *type,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *name);
 
 axis2_qname_t *AXIS2_CALL
 xml_schema_type_get_qname(void *type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 /************************** end       ****************************************/
 
 AXIS2_EXTERN xml_schema_type_t * AXIS2_CALL
-xml_schema_type_create(const axis2_env_t *env,
+xml_schema_type_create(const axutil_env_t *env,
         xml_schema_t *schema)
 {
     xml_schema_type_impl_t *type_impl = NULL;
@@ -251,7 +251,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_type_free(void *type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_type_impl_t *type_impl = NULL;
 
@@ -286,7 +286,7 @@
 
 xml_schema_annotated_t *AXIS2_CALL
 xml_schema_type_get_base_impl(void *type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_type_impl_t *type_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -297,7 +297,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 xml_schema_type_resolve_methods(
     xml_schema_type_t *type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_type_t *type_impl,
     XML_SCHEMA_SUPER_OBJS_FN super_objs,
     XML_SCHEMA_GET_TYPE_FN get_type,
@@ -360,7 +360,7 @@
 
 void *AXIS2_CALL
 xml_schema_type_get_base_schema_type(void *type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_type_impl_t *type_impl = NULL;
     axis2_hash_t *ht_super = NULL;
@@ -378,7 +378,7 @@
 
 xml_schema_data_type_t *AXIS2_CALL
 xml_schema_type_get_data_type(void *type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_type_impl_t *type_impl = NULL;
     axis2_hash_t *ht_super = NULL;
@@ -396,7 +396,7 @@
 
 xml_schema_derivation_method_t *AXIS2_CALL
 xml_schema_type_get_derive_by(void *type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_type_impl_t *type_impl = NULL;
     axis2_hash_t *ht_super = NULL;
@@ -414,7 +414,7 @@
 
 xml_schema_derivation_method_t *AXIS2_CALL
 xml_schema_type_get_final(void *type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_type_impl_t *type_impl = NULL;
     axis2_hash_t *ht_super = NULL;
@@ -432,7 +432,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_type_set_final(void *type,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         xml_schema_derivation_method_t *final_derivation)
 {
     xml_schema_type_impl_t *type_impl = NULL;
@@ -458,7 +458,7 @@
 
 xml_schema_derivation_method_t *AXIS2_CALL
 xml_schema_type_get_final_resolved(void *type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_type_impl_t *type_impl = NULL;
     axis2_hash_t *ht_super = NULL;
@@ -477,7 +477,7 @@
 
 axis2_bool_t AXIS2_CALL
 xml_schema_type_is_mixed(void *type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_type_impl_t *type_impl = NULL;
     axis2_hash_t *ht_super = NULL;
@@ -495,7 +495,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_type_set_mixed(void *type,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_bool_t is_mixed)
 {
     xml_schema_type_impl_t *type_impl = NULL;
@@ -514,7 +514,7 @@
 
 axis2_char_t *AXIS2_CALL
 xml_schema_type_get_name(void *type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_type_impl_t *type_impl = NULL;
     axis2_hash_t *ht_super = NULL;
@@ -532,7 +532,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_type_set_name(void *type,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *name)
 {
     xml_schema_type_impl_t *type_impl = NULL;
@@ -562,7 +562,7 @@
 
 axis2_qname_t *AXIS2_CALL
 xml_schema_type_get_qname(void *type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_type_impl_t *type_impl = NULL;
     axis2_hash_t *ht_super = NULL;
@@ -598,14 +598,14 @@
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_type_get_type(void *type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(type)->obj_type;
 }
 
 axis2_hash_t*  AXIS2_CALL
 xml_schema_type_super_objs(void *type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(type)->ht_super;
 }

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c Fri Mar 30 10:26:22 2007
@@ -26,12 +26,12 @@
 */
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-get_file_url(const axis2_env_t *env,
+get_file_url(const axutil_env_t *env,
         axis2_char_t *path);
 
 AXIS2_EXTERN xml_schema_input_source_t* AXIS2_CALL
 xml_schema_url_resolver_resolve_entity(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *ns,
     axis2_char_t *schema_location,
     axis2_char_t *base_uri)
@@ -81,7 +81,7 @@
 }
 */
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-get_file_url(const axis2_env_t *env,
+get_file_url(const axutil_env_t *env,
         axis2_char_t *path)
 {
     axis2_char_t *modified_path = NULL;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c Fri Mar 30 10:26:22 2007
@@ -41,36 +41,36 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_use_free(void *use,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_hash_t *AXIS2_CALL
 xml_schema_use_super_objs(
     void *use,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_use_get_type(
     void *use,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_enum_t *AXIS2_CALL
 xml_schema_use_get_base_impl(void *use,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 xml_schema_use_resolve_methods(
     xml_schema_use_t *use,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_use_t *use_impl,
     axis2_hash_t *methods);
 
 axutil_array_list_t * AXIS2_CALL
 xml_schema_use_get_values(void *use,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
 AXIS2_EXTERN xml_schema_use_t * AXIS2_CALL
-xml_schema_use_create(const axis2_env_t *env,
+xml_schema_use_create(const axutil_env_t *env,
         axis2_char_t *value)
 {
     xml_schema_use_impl_t *use_impl = NULL;
@@ -146,7 +146,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_use_free(void *use,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_use_impl_t *use_impl = NULL;
 
@@ -205,7 +205,7 @@
 axis2_hash_t *AXIS2_CALL
 xml_schema_use_super_objs(
     void *use,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_use_impl_t *use_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -216,7 +216,7 @@
 xml_schema_types_t AXIS2_CALL
 xml_schema_use_get_type(
     void *use,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_use_impl_t *use_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -226,7 +226,7 @@
 
 xml_schema_enum_t *AXIS2_CALL
 xml_schema_use_get_base_impl(void *use,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_use_impl_t *use_impl = NULL;
 
@@ -238,7 +238,7 @@
 
 axutil_array_list_t *AXIS2_CALL
 xml_schema_use_get_values(void *use,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_use_impl_t *use_impl = NULL;
     axis2_hash_t *super = NULL;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c Fri Mar 30 10:26:22 2007
@@ -40,31 +40,31 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_xpath_free(void *xpath,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_annotated_t *AXIS2_CALL
 xml_schema_xpath_get_base_impl(void *xpath,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_xpath_get_type(void *xpath,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_hash_t *AXIS2_CALL
 xml_schema_xpath_super_objs(void *xpath,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_char_t *AXIS2_CALL
 xml_schema_xpath_get_xpath(void *xpath,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_xpath_set_xpath(void *xpath,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *x_path);
 
 AXIS2_EXTERN xml_schema_xpath_t * AXIS2_CALL
-xml_schema_xpath_create(const axis2_env_t *env)
+xml_schema_xpath_create(const axutil_env_t *env)
 {
     xml_schema_xpath_impl_t *xpath_impl = NULL;
     axis2_status_t status = AXIS2_FAILURE;
@@ -125,7 +125,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_xpath_free(void *xpath,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_xpath_impl_t *xpath_impl = NULL;
 
@@ -165,7 +165,7 @@
 
 xml_schema_annotated_t *AXIS2_CALL
 xml_schema_xpath_get_base_impl(void *xpath,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_xpath_impl_t *xpath_impl = NULL;
 
@@ -179,7 +179,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 xml_schema_xpath_resolve_methods(
                                 xml_schema_xpath_t *xpath,
-                                const axis2_env_t *env,
+                                const axutil_env_t *env,
                                 xml_schema_xpath_t *xpath_impl,
                                 axis2_hash_t *methods)
 {
@@ -209,7 +209,7 @@
 
 axis2_char_t *AXIS2_CALL
 xml_schema_xpath_get_xpath(void *xpath,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(xpath)->x_path;
@@ -217,7 +217,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_xpath_set_xpath(void *xpath,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *x_path)
 {
     xml_schema_xpath_impl_t *xpath_impl = NULL;
@@ -242,14 +242,14 @@
 }
 xml_schema_types_t AXIS2_CALL
 xml_schema_xpath_get_type(void *xpath,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(xpath)->obj_type;
 }
 
 axis2_hash_t *AXIS2_CALL
 xml_schema_xpath_super_objs(void *xpath,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(xpath)->ht_super;
 }

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c Fri Mar 30 10:26:22 2007
@@ -43,26 +43,26 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_severity_type_free(void *severity_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_enum_t *AXIS2_CALL
 xml_schema_severity_type_get_base_impl(void *severity_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axutil_array_list_t *AXIS2_CALL
 xml_schema_severity_type_get_values(void *severity_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_hash_t *AXIS2_CALL
 xml_schema_severity_type_super_objs(void *severity_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_severity_type_get_type(void *severity_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 AXIS2_EXTERN xml_schema_severity_type_t * AXIS2_CALL
-xml_schema_severity_type_create(const axis2_env_t *env,
+xml_schema_severity_type_create(const axutil_env_t *env,
         axis2_char_t *value)
 {
     xml_schema_severity_type_impl_t *severity_type_impl = NULL;
@@ -148,7 +148,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_severity_type_free(void *severity_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_severity_type_impl_t *severity_type_impl = NULL;
 
@@ -200,7 +200,7 @@
 
 xml_schema_enum_t *AXIS2_CALL
 xml_schema_severity_type_get_base_impl(void *severity_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_severity_type_impl_t *severity_type_impl = NULL;
 
@@ -211,7 +211,7 @@
 
 axutil_array_list_t* AXIS2_CALL
 xml_schema_severity_type_get_values(void *severity_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     /*
     xml_schema_severity_type_impl_t *severity_impl = NULL;
@@ -230,14 +230,14 @@
 
 axis2_hash_t *AXIS2_CALL
 xml_schema_severity_type_super_objs(void *severity_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(severity_type)->ht_super;
 }
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_severity_type_get_type(void *severity_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(severity_type)->type;
 }

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c Fri Mar 30 10:26:22 2007
@@ -44,28 +44,28 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_tokenized_type_free(void *tokenized_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_enum_t *AXIS2_CALL
 xml_schema_tokenized_type_get_base_impl(void *tokenized_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axutil_array_list_t * AXIS2_CALL
 xml_schema_tokenized_type_get_values(void *tokenized_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_tokenized_type_get_type(void *tokenized_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_hash_t* AXIS2_CALL
 xml_schema_tokenized_type_super_objs(void *tokenized_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 /***************************** end macros **************************************/
 
 AXIS2_EXTERN xml_schema_tokenized_type_t * AXIS2_CALL
-xml_schema_tokenized_type_create(const axis2_env_t *env,
+xml_schema_tokenized_type_create(const axutil_env_t *env,
         axis2_char_t *value)
 {
     xml_schema_tokenized_type_impl_t *tokenized_type_impl = NULL;
@@ -166,7 +166,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_tokenized_type_free(void *tokenized_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_tokenized_type_impl_t *tokenized_type_impl = NULL;
 
@@ -214,14 +214,14 @@
 
 xml_schema_enum_t *AXIS2_CALL
 xml_schema_tokenized_type_get_base_impl(void *tokenized_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(tokenized_type)->schema_enum;
 }
 
 axutil_array_list_t *AXIS2_CALL
 xml_schema_tokenized_type_get_values(void *tokenized_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     /*
     xml_schema_tokenized_type_impl_t *tokenized_impl = NULL;
@@ -243,14 +243,14 @@
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_tokenized_type_get_type(void *tokenized_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(tokenized_type)->obj_type;
 }
 
 axis2_hash_t* AXIS2_CALL
 xml_schema_tokenized_type_super_objs(void *tokenized_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(tokenized_type)->ht_super;
 }

Modified: webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c (original)
+++ webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c Fri Mar 30 10:26:22 2007
@@ -19,12 +19,12 @@
 #include <stdio.h>
 #include <axiom.h>
 #include <xml_schema_includes.h>
-#include <axis2_env.h>
+#include <axutil_env.h>
 #include "xml_schema_test.h"
 
 
 static axiom_document_t*
-get_document_from_filename(const axis2_env_t *env,
+get_document_from_filename(const axutil_env_t *env,
         axis2_char_t *filename);
 
 void test_simple_type_schema_generation(CuTest *tc);
@@ -67,7 +67,7 @@
 
 void test_simple_type_schema_generation(CuTest *tc)
 {
-    const axis2_env_t *env = NULL;
+    const axutil_env_t *env = NULL;
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
@@ -79,7 +79,7 @@
     void *sch_type = NULL;
     axis2_char_t *filename = "./..//test-resources/allSimpleTypes.xsd";
 
-    env = axis2_env_create_all("test.log", 1);
+    env = axutil_env_create_all("test.log", 1);
     om_doc = get_document_from_filename(env, filename);
     sch_collection = xml_schema_collection_create(env);
     schema = XML_SCHEMA_COLLECTION_READ_DOCUMENT(
@@ -113,7 +113,7 @@
 
 void test_any_attribute(CuTest *tc)
 {
-    axis2_env_t *env = NULL;
+    axutil_env_t *env = NULL;
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
@@ -126,7 +126,7 @@
 
     axis2_char_t *filename = "./..//test-resources/anyAttTest.xsd";
 
-    env = axis2_env_create_all("test.log", 1);
+    env = axutil_env_create_all("test.log", 1);
 
     om_doc = get_document_from_filename(env, filename);
 
@@ -161,7 +161,7 @@
 
 void test_block_content(CuTest *tc)
 {
-    axis2_env_t *env = NULL;
+    axutil_env_t *env = NULL;
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
@@ -172,7 +172,7 @@
 
     axis2_char_t *filename = "./..//test-resources/block.xsd";
 
-    env = axis2_env_create_all("test.log", 1);
+    env = axutil_env_create_all("test.log", 1);
 
     om_doc = get_document_from_filename(env, filename);
 
@@ -200,14 +200,14 @@
 
 void test_circular_schema(CuTest *tc)
 {
-    axis2_env_t *env = NULL;
+    axutil_env_t *env = NULL;
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
     axis2_char_t *filename = NULL;
     axutil_array_list_t *schemas = NULL;
 
-    env = axis2_env_create_all("test.log", 1);
+    env = axutil_env_create_all("test.log", 1);
 
     sch_collection = xml_schema_collection_create(env);
 
@@ -235,13 +235,13 @@
 }
 void test_schema_import1(CuTest *tc)
 {
-    axis2_env_t *env = NULL;
+    axutil_env_t *env = NULL;
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
     axis2_char_t *filename = NULL;
 
-    env = axis2_env_create_all("test.log", 1);
+    env = axutil_env_create_all("test.log", 1);
 
     sch_collection = xml_schema_collection_create(env);
 
@@ -268,7 +268,7 @@
 
 void test_mixed_content(CuTest *tc)
 {
-    axis2_env_t *env = NULL;
+    axutil_env_t *env = NULL;
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
@@ -278,7 +278,7 @@
     axis2_char_t *filename = "./..//test-resources/mixedContent.xsd";
     ;
 
-    env = axis2_env_create_all("test.log", 1);
+    env = axutil_env_create_all("test.log", 1);
 
     qn = axis2_qname_create(env, "complexElt",
             "http://soapinterop.org/xsd", NULL);
@@ -300,7 +300,7 @@
 
 void test_local_elements(CuTest *tc)
 {
-    axis2_env_t *env = NULL;
+    axutil_env_t *env = NULL;
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
@@ -320,7 +320,7 @@
 
     axis2_char_t *filename = "./..//test-resources/elementForm.xsd";
 
-    env = axis2_env_create_all("test.log", 1);
+    env = axutil_env_create_all("test.log", 1);
 
     om_doc = get_document_from_filename(env, filename);
 
@@ -377,7 +377,7 @@
 
 void test_element_refs(CuTest *tc)
 {
-    axis2_env_t *env = NULL;
+    axutil_env_t *env = NULL;
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
@@ -392,7 +392,7 @@
 
     filename = "./..//test-resources/elementreferences.xsd";
 
-    env = axis2_env_create_all("test.log", 1);
+    env = axutil_env_create_all("test.log", 1);
 
     om_doc = get_document_from_filename(env, filename);
 
@@ -437,7 +437,7 @@
 
 void test_forward_refs(CuTest *tc)
 {
-    axis2_env_t *env = NULL;
+    axutil_env_t *env = NULL;
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
@@ -450,7 +450,7 @@
 
     filename = "./..//test-resources/forwardRef.xsd";
 
-    env = axis2_env_create_all("test.log", 1);
+    env = axutil_env_create_all("test.log", 1);
 
 
     om_doc = get_document_from_filename(env, filename);
@@ -484,7 +484,7 @@
 
 void test_local_unnamed_simple_type(CuTest *tc)
 {
-    axis2_env_t *env = NULL;
+    axutil_env_t *env = NULL;
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
@@ -513,7 +513,7 @@
             "</element>\n"
             "</schema>";
 
-    env = axis2_env_create_all("test.log", 1);
+    env = axutil_env_create_all("test.log", 1);
 
     reader = axiom_xml_reader_create_for_memory(env, xml, axis2_strlen(xml), NULL,
             AXIS2_XML_PARSER_TYPE_BUFFER);
@@ -533,7 +533,7 @@
 
 void test_simple_restriction(CuTest *tc)
 {
-    axis2_env_t *env = NULL;
+    axutil_env_t *env = NULL;
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
@@ -543,7 +543,7 @@
     void *simple_type = NULL;
 
 
-    env = axis2_env_create_all("test.log", 1);
+    env = axutil_env_create_all("test.log", 1);
 
     om_doc = get_document_from_filename(env,
             "./../test-resources/SimpleContentRestriction.xsd");
@@ -573,7 +573,7 @@
 
 void test_unqualified_schemas(CuTest *tc)
 {
-    axis2_env_t *env = NULL;
+    axutil_env_t *env = NULL;
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
@@ -592,7 +592,7 @@
     void *particle = NULL;
 
 
-    env = axis2_env_create_all("test.log", 1);
+    env = axutil_env_create_all("test.log", 1);
 
     om_doc = get_document_from_filename(env,
             "./../test-resources/unqualifiedTypes.xsd");
@@ -641,7 +641,7 @@
 {}
 
 static axiom_document_t*
-get_document_from_filename(const axis2_env_t *env,
+get_document_from_filename(const axutil_env_t *env,
         axis2_char_t *filename)
 {
     axiom_xml_reader_t *reader = NULL;



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