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 [40/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_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c Fri Mar 30 10:26:22 2007
@@ -52,90 +52,90 @@
 xml_schema_t* AXIS2_CALL
 xml_schema_builder_build(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_document_t *om_doc,
     axis2_char_t *uri);
 
 xml_schema_t* AXIS2_CALL
 xml_schema_builder_build_with_root_node(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *root,
     axis2_char_t *uri);
 
 axis2_status_t AXIS2_CALL
 xml_schema_builder_free(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 
 static xml_schema_t*
 handle_xml_schema_element(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ele_node,
     axis2_char_t  *uri);
 
 static xml_schema_annotation_t*
 handle_annotation(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ann_node,
     axiom_node_t *sch_node);
 
 static xml_schema_redefine_t*
 handle_redefine(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *redefine_node,
     axiom_node_t *sch_node);
 
 static axis2_status_t
 set_namespace_attributes(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_t *schema,
     axiom_node_t *sch_node);
 
 static axis2_status_t
 put_namespace(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix,
     axis2_char_t *ns);
 
 static xml_schema_simple_type_t*
 handle_simple_type(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *simple_node,
     axiom_node_t *sch_node);
 
 static xml_schema_complex_type_t*
 handle_complex_type(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *complex_node,
     axiom_node_t *schema_node);
 
 static xml_schema_simple_content_t*
 handle_simple_content(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *simple_node,
     axiom_node_t *schema_node);
 
 static xml_schema_complex_content_t*
 handle_complex_content(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *complex_node,
     axiom_node_t *schema_node);
 
 static xml_schema_simple_content_restriction_t*
 handle_simple_content_restriction(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *res_node,
     axiom_node_t *schema_node);
 
@@ -143,98 +143,98 @@
 static xml_schema_simple_content_extension_t*
 handle_simple_content_extension(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *sim_ext_node,
     axiom_node_t *schema_node);
 
 static xml_schema_complex_content_restriction_t*
 handle_complex_content_restriction(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *res_node,
     axiom_node_t *schema_node);
 
 static xml_schema_complex_content_extension_t*
 handle_complex_content_extension(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *cmp_ext_node,
     axiom_node_t *schema_node);
 
 static xml_schema_attribute_group_ref_t*
 handle_attribute_group_ref(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *attr_grp_node,
     axiom_node_t *schema_node);
 
 static xml_schema_group_base_t*
 handle_sequence(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *seq_node,
     axiom_node_t *schema_node);
 
 static xml_schema_any_t*
 handle_any(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *any_node,
     axiom_node_t *schema_node);
 
 static xml_schema_group_base_t*
 handle_choice(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *choice_node,
     axiom_node_t *schema_node);
 
 static xml_schema_group_base_t*
 handle_all(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *all_node,
     axiom_node_t *schema_node);
 
 static xml_schema_group_t*
 handle_group(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *group_node,
     axiom_node_t *schema_node);
 
 static xml_schema_attribute_group_t*
 handle_attribute_group(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *attr_grp_node,
     axiom_node_t *schema_node);
 
 static xml_schema_any_attribute_t*
 handle_any_attribute(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *any_attr_node,
     axiom_node_t *schema_node);
 
 static xml_schema_group_ref_t*
 handle_group_ref(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *grp_ref_node,
     axiom_node_t *schema_node);
 
 static xml_schema_attribute_t*
 handle_attribute(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *attr_node,
     axiom_node_t *schema_node);
 
 static xml_schema_element_t*
 handle_element(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ele_node,
     axiom_node_t *schema_node,
     axis2_bool_t is_global);
@@ -242,14 +242,14 @@
 static axis2_status_t
 populate_element_namespaces(
         xml_schema_builder_t *builder,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_node_t *ele_node,
         axis2_hash_t* ele_to_ns_map);
 */
 static xml_schema_identity_constraint_t*
 handle_constraint(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *attr_node,
     axiom_node_t *schema_node,
     int type);
@@ -257,14 +257,14 @@
 static xml_schema_import_t*
 handle_import(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *import_node,
     axiom_node_t *schema_node);
 
 static xml_schema_external_t *
 handle_include(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *include_node,
     axiom_node_t *schema_node);
 
@@ -272,69 +272,69 @@
 static xml_schema_app_info_t*
 handle_app_info(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *content);
 
 static xml_schema_documentation_t*
 handle_documentation(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *content);
 
 static long
 get_min_occurs(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *content);
 
 static long
 get_max_occurs(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *content);
 
 static xml_schema_derivation_method_t*
 get_derivation(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ele_node,
     axis2_char_t *attr_name);
 
 static axis2_char_t *
 get_enum_string(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_element_t *om_ele,
     axis2_char_t *attr_name);
 
 xml_schema_t* AXIS2_CALL
 xml_schema_builder_resolve_xml_schema(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *target_namespace,
     axis2_char_t *schema_location,
     axis2_char_t *base_uri);
 
 static axis2_bool_t
 value_exist_in_hash(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_hash_t *ht,
     axis2_char_t *value);
 
 static xml_schema_form_t*
 get_from_default(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ele_node,
     axis2_char_t *attr_name);
 
 static xml_schema_t *
 resolve_xml_schema(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *target_namespace,
     axis2_char_t *schema_location);
 
 static xml_schema_t *
 resolve_xml_schema_with_uri(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *target_namespace,
     axis2_char_t *schema_location,
     axis2_char_t *base_uri);
@@ -342,12 +342,12 @@
 static xml_schema_annotation_t*
 handle_annotation_with_element(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ann_node);
 
 AXIS2_EXTERN xml_schema_builder_t * AXIS2_CALL
 xml_schema_builder_create(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_collection_t *sch_collection)
 {
     xml_schema_builder_impl_t *builder_impl = NULL;
@@ -412,7 +412,7 @@
 xml_schema_t* AXIS2_CALL
 xml_schema_builder_build(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_document_t *om_doc,
     axis2_char_t *uri)
 {
@@ -436,7 +436,7 @@
 xml_schema_t* AXIS2_CALL
 xml_schema_builder_build_with_root_node(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *root,
     axis2_char_t *uri)
 {
@@ -446,7 +446,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_builder_free(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_builder_impl_t *builder_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -472,7 +472,7 @@
 static xml_schema_t*
 handle_xml_schema_element(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ele_node,
     axis2_char_t  *uri)
 {
@@ -763,7 +763,7 @@
 static xml_schema_annotation_t*
 handle_annotation(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ann_node,
     axiom_node_t *sch_node)
 {
@@ -819,7 +819,7 @@
 static xml_schema_redefine_t*
 handle_redefine(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *redefine_node,
     axiom_node_t *sch_node)
 {
@@ -935,7 +935,7 @@
 static axis2_status_t
 set_namespace_attributes(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_t *schema,
     axiom_node_t *sch_node)
 {
@@ -1035,7 +1035,7 @@
 static axis2_status_t
 put_namespace(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix,
     axis2_char_t *ns)
 {
@@ -1064,7 +1064,7 @@
 static xml_schema_simple_type_t*
 handle_simple_type(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *simple_node,
     axiom_node_t *sch_node)
 {
@@ -1426,7 +1426,7 @@
 static xml_schema_complex_type_t*
 handle_complex_type(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *complex_node,
     axiom_node_t *schema_node)
 {
@@ -1619,7 +1619,7 @@
 static xml_schema_simple_content_t*
 handle_simple_content(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *simple_node,
     axiom_node_t *schema_node)
 {
@@ -1676,7 +1676,7 @@
 static xml_schema_complex_content_t*
 handle_complex_content(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *complex_node,
     axiom_node_t *schema_node)
 {
@@ -1732,7 +1732,7 @@
 static xml_schema_simple_content_restriction_t*
 handle_simple_content_restriction(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *res_node,
     axiom_node_t *schema_node)
 {
@@ -1879,7 +1879,7 @@
 static xml_schema_simple_content_extension_t*
 handle_simple_content_extension(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ext_node,
     axiom_node_t *schema_node)
 {
@@ -1981,7 +1981,7 @@
 static xml_schema_complex_content_restriction_t*
 handle_complex_content_restriction(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *res_node,
     axiom_node_t *schema_node)
 {
@@ -2099,7 +2099,7 @@
 static xml_schema_complex_content_extension_t*
 handle_complex_content_extension(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ext_node,
     axiom_node_t *schema_node)
 {
@@ -2219,7 +2219,7 @@
 static xml_schema_attribute_group_ref_t*
 handle_attribute_group_ref(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *attr_grp_node,
     axiom_node_t *schema_node)
 {
@@ -2291,7 +2291,7 @@
 static xml_schema_group_base_t*
 handle_sequence(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *seq_node,
     axiom_node_t *schema_node)
 {
@@ -2362,7 +2362,7 @@
 static xml_schema_any_t*
 handle_any(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *any_node,
     axiom_node_t *schema_node)
 {
@@ -2417,7 +2417,7 @@
 static xml_schema_group_base_t*
 handle_choice(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *choice_node,
     axiom_node_t *schema_node)
 {
@@ -2502,7 +2502,7 @@
 static xml_schema_group_base_t*
 handle_all(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *all_node,
     axiom_node_t *schema_node)
 {
@@ -2545,7 +2545,7 @@
 static xml_schema_group_t*
 handle_group(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *group_node,
     axiom_node_t *schema_node)
 {
@@ -2611,7 +2611,7 @@
 static xml_schema_attribute_group_t*
 handle_attribute_group(
     xml_schema_builder_t* builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *attr_grp_node,
     axiom_node_t *schema_node)
 {
@@ -2686,7 +2686,7 @@
 static xml_schema_any_attribute_t*
 handle_any_attribute(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *any_attr_node,
     axiom_node_t *schema_node)
 {
@@ -2750,7 +2750,7 @@
 static xml_schema_group_ref_t*
 handle_group_ref(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *grp_ref_node,
     axiom_node_t *schema_node)
 {
@@ -2848,7 +2848,7 @@
 static xml_schema_attribute_t*
 handle_attribute(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *attr_node,
     axiom_node_t *schema_node)
 {
@@ -3085,7 +3085,7 @@
 static xml_schema_element_t*
 handle_element(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ele_node,
     axiom_node_t *schema_node,
     axis2_bool_t is_global)
@@ -3462,7 +3462,7 @@
 static axis2_status_t
 populate_element_namespaces(
         xml_schema_builder_t *builder,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_node_t *ele_node,
         axis2_hash_t* ele_to_ns_map)
 {
@@ -3503,7 +3503,7 @@
 static xml_schema_identity_constraint_t*
 handle_constraint(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *cnst_node,
     axiom_node_t *schema_node,
     int type)
@@ -3659,7 +3659,7 @@
 static xml_schema_import_t*
 handle_import(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *import_node,
     axiom_node_t *schema_node)
 {
@@ -3720,7 +3720,7 @@
 static xml_schema_external_t *
 handle_include(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *include_node,
     axiom_node_t *schema_node)
 {
@@ -3770,7 +3770,7 @@
 static xml_schema_annotation_t*
 handle_annotation_with_element(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ann_node)
 {
     xml_schema_obj_collection_t *content = NULL;
@@ -3824,7 +3824,7 @@
 static xml_schema_app_info_t*
 handle_app_info(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *content)
 {
     void *app_info = NULL;
@@ -3851,7 +3851,7 @@
 static xml_schema_documentation_t*
 handle_documentation(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *content)
 {
     void *documentation = NULL;
@@ -3884,7 +3884,7 @@
 
 static long
 get_min_occurs(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ele_node)
 {
     axis2_char_t *attr_value = NULL;
@@ -3908,7 +3908,7 @@
 
 static long
 get_max_occurs(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ele_node)
 {
     axiom_element_t *om_ele = NULL;
@@ -3934,7 +3934,7 @@
 
 static xml_schema_derivation_method_t*
 get_derivation(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ele_node,
     axis2_char_t *attr_name)
 {
@@ -3963,7 +3963,7 @@
 static axis2_char_t *
 get_enum_string(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_element_t *om_ele,
     axis2_char_t *attr_name)
 {
@@ -3983,7 +3983,7 @@
 
 static axis2_bool_t
 value_exist_in_hash(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_hash_t *ht,
     axis2_char_t *value)
 {
@@ -4008,7 +4008,7 @@
 
 static xml_schema_form_t*
 get_from_default(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *ele_node,
     axis2_char_t *attr_name)
 {
@@ -4030,7 +4030,7 @@
 static xml_schema_t *
 resolve_xml_schema(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *target_namespace,
     axis2_char_t *schema_location)
 {
@@ -4050,7 +4050,7 @@
 static xml_schema_t *
 resolve_xml_schema_with_uri(
     xml_schema_builder_t *builder,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *target_namespace,
     axis2_char_t *schema_location,
     axis2_char_t *base_uri)

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c Fri Mar 30 10:26:22 2007
@@ -49,134 +49,134 @@
 axis2_status_t AXIS2_CALL
 xml_schema_collection_free(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_collection_set_base_uri(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *base_uri);
 
 axis2_char_t* AXIS2_CALL
 xml_schema_collection_get_base_uri(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_collection_init(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 
 xml_schema_t* AXIS2_CALL
 xml_schema_collection_read_with_reader(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_xml_reader_t *reader);
 
 xml_schema_t * AXIS2_CALL
 xml_schema_collection_read_document(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_document_t* document);
 
 xml_schema_t * AXIS2_CALL
 xml_schema_collection_read_element(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *node);
 
 xml_schema_t* AXIS2_CALL
 xml_schema_collection_read_document_with_uri(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_document_t *document,
     axis2_char_t *uri);
 
 xml_schema_t * AXIS2_CALL
 xml_schema_collection_read_element_with_uri(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *node,
     axis2_char_t *uri);
 
 xml_schema_element_t * AXIS2_CALL
 xml_schema_collection_get_element_by_qname(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *qname);
 
 xml_schema_type_t * AXIS2_CALL
 xml_schema_collection_get_type_by_qname(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *schema_type_qname);
 
 
 axis2_status_t AXIS2_CALL
 xml_schema_collection_add_unresolved_type(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *qtype,
     void *receiver);
 
 axis2_status_t AXIS2_CALL
 xml_schema_collection_resolve_type(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *type_qname,
     xml_schema_type_t *type);
 
 axis2_char_t * AXIS2_CALL
 xml_schema_collection_get_namespace_for_prefix(
     xml_schema_collection_t *collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix);
 
 
 axis2_status_t AXIS2_CALL
 xml_schema_collection_map_namespace(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix,
     axis2_char_t *namespc_uri);
 
 static axis2_status_t
 add_simple_type(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_t* schema,
     axis2_char_t *type_name);
 
 axis2_hash_t* AXIS2_CALL
 xml_schema_collection_get_systemid2_schemas(
     xml_schema_collection_t *collection,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axutil_array_list_t* AXIS2_CALL
 xml_schema_collection_get_schemas(
     xml_schema_collection_t *collection,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_collection_set_schemas(
     xml_schema_collection_t *collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axutil_array_list_t *schemas);
 
 axis2_hash_t* AXIS2_CALL
 xml_schema_collection_get_namespaces(
     xml_schema_collection_t *collection,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_t* AXIS2_CALL
 xml_schema_collection_get_schema(
     xml_schema_collection_t *collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *system_id);
 
 
 AXIS2_EXTERN xml_schema_collection_t * AXIS2_CALL
-xml_schema_collection_create(const axis2_env_t *env)
+xml_schema_collection_create(const axutil_env_t *env)
 {
     xml_schema_collection_impl_t *collection_impl = NULL;
 
@@ -299,7 +299,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_collection_free(
     xml_schema_collection_t *collection,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_collection_impl_t *collec_impl = NULL;
 
@@ -337,7 +337,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_collection_set_base_uri(
     xml_schema_collection_t*collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *base_uri)
 {
     xml_schema_collection_impl_t *collec_impl = NULL;
@@ -358,7 +358,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_collection_init(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_collection_impl_t *collection_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -447,7 +447,7 @@
 xml_schema_t* AXIS2_CALL
 xml_schema_collection_read_with_reader(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_xml_reader_t *reader)
 {
     xml_schema_builder_t *sch_builder = NULL;
@@ -481,7 +481,7 @@
 xml_schema_t * AXIS2_CALL
 xml_schema_collection_read_document(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_document_t* document)
 {
     xml_schema_builder_t *sch_builder = NULL;
@@ -496,7 +496,7 @@
 xml_schema_t * AXIS2_CALL
 xml_schema_collection_read_element(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *node)
 {
     xml_schema_builder_t *sch_builder = NULL;
@@ -515,7 +515,7 @@
 xml_schema_t* AXIS2_CALL
 xml_schema_collection_read_document_with_uri(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_document_t *document,
     axis2_char_t *uri)
 {
@@ -532,7 +532,7 @@
 xml_schema_t * AXIS2_CALL
 xml_schema_collection_read_element_with_uri(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_node_t *node,
     axis2_char_t *uri)
 {
@@ -554,7 +554,7 @@
 xml_schema_element_t * AXIS2_CALL
 xml_schema_collection_get_element_by_qname(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *qname)
 {
     axis2_char_t *uri = NULL;
@@ -578,7 +578,7 @@
 xml_schema_type_t * AXIS2_CALL
 xml_schema_collection_get_type_by_qname(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *schema_type_qname)
 {
 
@@ -605,7 +605,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_collection_add_unresolved_type(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *qtype,
     void *obj)
 {
@@ -641,7 +641,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_collection_resolve_type(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *type_qname,
     xml_schema_type_t *type)
 {
@@ -686,7 +686,7 @@
 axis2_char_t *AXIS2_CALL
 xml_schema_collection_get_namespace_for_prefix(
     xml_schema_collection_t  *collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix)
 {
     xml_schema_collection_impl_t *collection_impl = NULL;
@@ -707,7 +707,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_collection_map_namespace(
     xml_schema_collection_t  *collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix,
     axis2_char_t *namespc_uri)
 {
@@ -725,7 +725,7 @@
 
 static axis2_status_t
 add_simple_type(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_t* schema,
     axis2_char_t *type_name)
 {
@@ -739,7 +739,7 @@
 axis2_hash_t* AXIS2_CALL
 xml_schema_collection_get_systemid2_schemas(
     xml_schema_collection_t *collection,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_collection_impl_t *collection_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -750,7 +750,7 @@
 axutil_array_list_t* AXIS2_CALL
 xml_schema_collection_get_schemas(
     xml_schema_collection_t *collection,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_collection_impl_t *collection_impl = NULL;
     collection_impl = AXIS2_INTF_TO_IMPL(collection);
@@ -760,7 +760,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_collection_set_schemas(
     xml_schema_collection_t *collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axutil_array_list_t *schemas)
 {
     xml_schema_collection_impl_t *collection_impl = NULL;
@@ -776,7 +776,7 @@
 axis2_hash_t* AXIS2_CALL
 xml_schema_collection_get_namespaces(
     xml_schema_collection_t *collection,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_collection_impl_t *collection_impl = NULL;
     collection_impl = AXIS2_INTF_TO_IMPL(collection);
@@ -786,7 +786,7 @@
 xml_schema_t* AXIS2_CALL
 xml_schema_collection_get_schema(
     xml_schema_collection_t *collection,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *system_id)
 {
     xml_schema_collection_impl_t *collection_impl = NULL;
@@ -799,7 +799,7 @@
 axis2_char_t* AXIS2_CALL
 xml_schema_collection_get_base_uri(
     xml_schema_collection_t* collection,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_collection_impl_t *collection_impl = NULL;
     collection_impl = AXIS2_INTF_TO_IMPL(collection);

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c Fri Mar 30 10:26:22 2007
@@ -48,56 +48,56 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_free(
     void *complex_content,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_annotated_t *AXIS2_CALL
 xml_schema_complex_content_get_base_impl(
     void *complex_content,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_complex_content_get_type(
     void *complex_content,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_hash_t* AXIS2_CALL
 xml_schema_complex_content_super_objs(
     void *complex_content,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 
 void* AXIS2_CALL
 xml_schema_complex_content_get_content(
     void *complex_content,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_set_content(
     void *complex_content,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void* content);
 
 axis2_char_t* AXIS2_CALL
 xml_schema_complex_content_to_string(
     void *complex_content,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix,
     int tab);
 
 axis2_bool_t AXIS2_CALL
 xml_schema_complex_content_is_mixed(
     void *complex_content,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_set_mixed(
     void *complex_content,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t mixed);
 
 
 AXIS2_EXTERN xml_schema_complex_content_t * AXIS2_CALL
-xml_schema_complex_content_create(const axis2_env_t *env)
+xml_schema_complex_content_create(const axutil_env_t *env)
 {
     xml_schema_complex_content_impl_t *complex_content_impl = NULL;
     axis2_status_t status = AXIS2_FAILURE;
@@ -197,7 +197,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_free(void *complex_content,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_complex_content_impl_t *complex_content_impl = NULL;
 
@@ -242,7 +242,7 @@
 xml_schema_annotated_t *AXIS2_CALL
 xml_schema_complex_content_get_base_impl(
     void *complex_content,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_complex_content_impl_t *complex_content_impl = NULL;
 
@@ -254,7 +254,7 @@
 void* AXIS2_CALL
 xml_schema_complex_content_get_content(
     void *complex_content,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(complex_content)->content;
@@ -263,7 +263,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_set_content(
     void *complex_content,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *content)
 {
     xml_schema_complex_content_impl_t *complex_content_impl = NULL;
@@ -285,7 +285,7 @@
 axis2_char_t* AXIS2_CALL
 xml_schema_complex_content_to_string(
     void *complex_content,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix,
     int tab)
 {
@@ -335,7 +335,7 @@
 axis2_bool_t AXIS2_CALL
 xml_schema_complex_content_is_mixed(
     void *complex_content,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_complex_content_impl_t *complex_content_impl = NULL;
     complex_content_impl = AXIS2_INTF_TO_IMPL(complex_content);
@@ -345,7 +345,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_set_mixed(
     void *complex_content,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t mixed)
 {
     xml_schema_complex_content_impl_t *complex_content_impl = NULL;
@@ -358,7 +358,7 @@
 xml_schema_types_t AXIS2_CALL
 xml_schema_complex_content_get_type(
     void *complex_content,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(complex_content)->obj_type;
 }
@@ -366,7 +366,7 @@
 axis2_hash_t* AXIS2_CALL
 xml_schema_complex_content_super_objs(
     void *complex_content,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(complex_content)->ht_super;
 }

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c Fri Mar 30 10:26:22 2007
@@ -50,72 +50,72 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_extension_free(
     void *cmp_cnt_ext,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_annotated_t *AXIS2_CALL
 xml_schema_complex_content_extension_get_base_impl(
     void *cmp_cnt_ext,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_complex_content_extension_get_type(
     void *cmp_cnt_ext,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_hash_t *AXIS2_CALL
 xml_schema_complex_content_extension_super_objs(
     void *cmp_cnt_ext,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_any_attribute_t* AXIS2_CALL
 xml_schema_complex_content_extension_get_any_attribute(
     void *cmp_cnt_ext,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_extension_set_any_attribute(
     void *cmp_cnt_ext,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_any_attribute_t *any_attr);
 
 xml_schema_obj_collection_t* AXIS2_CALL
 xml_schema_complex_content_extension_get_attributes(
     void *cmp_cnt_ext,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_extension_set_base_type_name(
     void *cmp_cnt_ext,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *base_type_name);
 
 axis2_qname_t* AXIS2_CALL
 xml_schema_complex_content_extension_get_base_type_name(
     void *cmp_cnt_ext,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 
 xml_schema_particle_t* AXIS2_CALL
 xml_schema_complex_content_extension_get_particle(
     void *cmp_cnt_ext,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_extension_set_particle(
     void *cmp_cnt_ext,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_particle_t *particle);
 
 axis2_char_t *AXIS2_CALL
 xml_schema_complex_content_extension_to_string(
     void *cmp_cnt_ext,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix,
     int tab);
 
 /*************************** end function protos **********************************/
 AXIS2_EXTERN xml_schema_complex_content_extension_t * AXIS2_CALL
-xml_schema_complex_content_extension_create(const axis2_env_t *env)
+xml_schema_complex_content_extension_create(const axutil_env_t *env)
 {
     xml_schema_complex_content_extension_impl_t *cmp_cnt_ext_impl = NULL;
     cmp_cnt_ext_impl = (xml_schema_complex_content_extension_impl_t*)
@@ -216,7 +216,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_extension_free(void *cmp_cnt_ext_ext_ext,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
 
@@ -259,7 +259,7 @@
 
 xml_schema_annotated_t *AXIS2_CALL
 xml_schema_complex_content_extension_get_base_impl(void *cmp_cnt_ext,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -271,7 +271,7 @@
 
 xml_schema_any_attribute_t* AXIS2_CALL
 xml_schema_complex_content_extension_get_any_attribute(void *cmp_cnt_ext,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_complex_content_extension_impl_t *cnt_ext_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -281,7 +281,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_extension_set_any_attribute(void *cmp_cnt_ext,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         xml_schema_any_attribute_t *any_attr)
 {
     xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
@@ -299,7 +299,7 @@
 
 xml_schema_obj_collection_t* AXIS2_CALL
 xml_schema_complex_content_extension_get_attributes(void *cmp_cnt_ext,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_complex_content_extension_impl_t *cnt_ext_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -310,7 +310,7 @@
 axis2_qname_t* AXIS2_CALL
 xml_schema_complex_content_extension_get_base_type_name(
     void *cmp_cnt_ext,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -321,7 +321,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_extension_set_base_type_name(
     void *cmp_cnt_ext,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *base_type_name)
 {
     xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
@@ -339,7 +339,7 @@
 xml_schema_particle_t* AXIS2_CALL
 xml_schema_complex_content_extension_get_particle(
     void *cmp_cnt_ext,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_cnt_ext)->particle;
 }
@@ -347,7 +347,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_extension_set_particle(
     void *cmp_cnt_ext,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_particle_t *particle)
 {
     xml_schema_complex_content_extension_impl_t *cmp_cnt_ext_impl = NULL;
@@ -366,7 +366,7 @@
 axis2_char_t *AXIS2_CALL
 xml_schema_complex_content_extension_to_string(
     void *cmp_cnt_ext,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix,
     int tab)
 {
@@ -376,7 +376,7 @@
 xml_schema_types_t AXIS2_CALL
 xml_schema_complex_content_extension_get_type(
     void *cmp_cnt_ext,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_cnt_ext)->obj_type;
 }
@@ -384,7 +384,7 @@
 axis2_hash_t *AXIS2_CALL
 xml_schema_complex_content_extension_super_objs(
     void *cmp_cnt_ext,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_cnt_ext)->ht_super;
 }

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c Fri Mar 30 10:26:22 2007
@@ -50,72 +50,72 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_restriction_free(
     void *cmp_content_res,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_annotated_t *AXIS2_CALL
 xml_schema_complex_content_restriction_get_base_impl(
     void *cmp_content_res,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_hash_t *AXIS2_CALL
 xml_schema_complex_content_restriction_super_objs(
     void *cmp_content_res,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_complex_content_restriction_get_type(
     void *cmp_content_res,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_any_attribute_t* AXIS2_CALL
 xml_schema_complex_content_restriction_get_any_attribute(
     void *cmp_content_res,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_restriction_set_any_attribute(
     void *cmp_content_res,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_any_attribute_t *any_attr);
 
 xml_schema_obj_collection_t* AXIS2_CALL
 xml_schema_complex_content_restriction_get_attributes(
     void *cmp_content_res,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_restriction_set_base_type_name(
     void *cmp_content_res,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *base_type_name);
 
 axis2_qname_t* AXIS2_CALL
 xml_schema_complex_content_restriction_get_base_type_name(
     void *cmp_content_res,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_char_t* AXIS2_CALL
 xml_schema_complex_content_restriction_to_string(
     void *cmp_cnt_res,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix,
     int tab);
 
 xml_schema_particle_t* AXIS2_CALL
 xml_schema_complex_content_restriction_get_particle(
     void *cmp_cnt_res,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_restriction_set_particle(
     void *cmp_content,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_particle_t *particle);
 
 
 /*****************************************************************************/
 AXIS2_EXTERN xml_schema_complex_content_restriction_t * AXIS2_CALL
-xml_schema_complex_content_restriction_create(const axis2_env_t *env)
+xml_schema_complex_content_restriction_create(const axutil_env_t *env)
 {
     xml_schema_complex_content_restriction_impl_t *cmp_content_res_impl = NULL;
 
@@ -230,7 +230,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_restriction_free(
     void *cmp_content_res,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
 
@@ -276,7 +276,7 @@
 xml_schema_annotated_t *AXIS2_CALL
 xml_schema_complex_content_restriction_get_base_impl(
     void *cmp_content_res,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -289,7 +289,7 @@
 xml_schema_any_attribute_t* AXIS2_CALL
 xml_schema_complex_content_restriction_get_any_attribute(
     void *cmp_content_res,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_complex_content_restriction_impl_t *cnt_res_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -300,7 +300,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_restriction_set_any_attribute(
     void *cmp_content_res,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_any_attribute_t *any_attr)
 {
     xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
@@ -320,7 +320,7 @@
 xml_schema_obj_collection_t* AXIS2_CALL
 xml_schema_complex_content_restriction_get_attributes(
     void *cmp_content,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_complex_content_restriction_impl_t *cnt_res_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -331,7 +331,7 @@
 axis2_qname_t* AXIS2_CALL
 xml_schema_complex_content_restriction_get_base_type_name(
     void *cmp_content,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -342,7 +342,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_restriction_set_base_type_name(
     void *cmp_content,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *base_type_name)
 {
     xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
@@ -360,7 +360,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_content_restriction_set_particle(
     void *cmp_content,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_particle_t *particle)
 {
     xml_schema_complex_content_restriction_impl_t *cmp_cnt_res_impl = NULL;
@@ -380,7 +380,7 @@
 xml_schema_particle_t* AXIS2_CALL
 xml_schema_complex_content_restriction_get_particle(
     void *cmp_cnt_res,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_cnt_res)->particle;
 }
@@ -388,7 +388,7 @@
 axis2_char_t* AXIS2_CALL
 xml_schema_complex_content_restriction_to_string(
     void *cmp_cnt_res,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix,
     int tab)
 {
@@ -399,7 +399,7 @@
 axis2_hash_t *AXIS2_CALL
 xml_schema_complex_content_restriction_super_objs(
     void *cmp_content_res,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_content_res)->ht_super;
 }
@@ -407,7 +407,7 @@
 xml_schema_types_t AXIS2_CALL
 xml_schema_complex_content_restriction_get_type(
     void *cmp_content_res,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_content_res)->obj_type;
 }

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c Fri Mar 30 10:26:22 2007
@@ -68,130 +68,130 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_type_free(
     void *complex_type,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 
 xml_schema_type_t* AXIS2_CALL
 xml_schema_complex_type_get_base_impl(
     void *complex_type,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_complex_type_get_type(
     void *complex_type,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_hash_t* AXIS2_CALL
 xml_schema_complex_type_super_objs(
     void *complex_type,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_any_attribute_t* AXIS2_CALL
 xml_schema_complex_type_get_any_attribute(
     void *cmp_type,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t  AXIS2_CALL
 xml_schema_complex_type_set_any_attribute(
     void *cmp_type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_any_attribute_t *any_attr);
 
 xml_schema_obj_collection_t* AXIS2_CALL
 xml_schema_complex_type_get_attributes(
     void *cmp_type,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_obj_table_t* AXIS2_CALL
 xml_schema_complex_type_get_attribute_use(
     void *cmp_type,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_any_attribute_t* AXIS2_CALL
 xml_schema_complex_type_get_attribute_wildcard(
     void *cmp_type,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_derivation_method_t* AXIS2_CALL
 xml_schema_complex_type_get_block(
     void *cmp_type,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_type_set_block(
     void *cmp_type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_derivation_method_t *block);
 
 xml_schema_derivation_method_t* AXIS2_CALL
 xml_schema_complex_type_get_block_resolved(
     void *cmp_type,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 void* AXIS2_CALL
 xml_schema_complex_type_get_content_model(
     void *cmp_type,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_type_set_content_model(
     void *cmp_type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *content_model);
 
 xml_schema_content_type_t* AXIS2_CALL
 xml_schema_complex_type_get_content_type(
     void *cmp_type,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_type_set_content_type(
     void *cmp_type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_content_type_t *content_type);
 
 xml_schema_particle_t * AXIS2_CALL
 xml_schema_complex_type_get_content_type_particle(
     void *cmp_type,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_bool_t AXIS2_CALL
 xml_schema_complex_type_is_abstract(
     void *cmp_type,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_type_set_abstract(
     void *cmp_type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t b);
 
 axis2_bool_t AXIS2_CALL
 xml_schema_complex_type_is_mixed(
     void *cmp_type,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_type_set_mixed(
     void *cmp_type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t b);
 
 void* AXIS2_CALL
 xml_schema_complex_type_get_particle(
     void *cmp_type,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_type_set_particle(
     void *cmp_type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *particle);
 
 axis2_char_t* AXIS2_CALL
 xml_schema_complex_type_to_string(
     void *cmp_type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix,
     int tab);
 
@@ -200,7 +200,7 @@
 
 AXIS2_EXTERN xml_schema_complex_type_t * AXIS2_CALL
 xml_schema_complex_type_create(
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_t *schema)
 {
     xml_schema_complex_type_impl_t *complex_type_impl = NULL;
@@ -352,7 +352,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_complex_type_free(void *complex_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_complex_type_impl_t *complex_type_impl = NULL;
 
@@ -383,7 +383,7 @@
 xml_schema_type_t *AXIS2_CALL
 xml_schema_complex_type_get_base_impl(
     void *complex_type,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_complex_type_impl_t *complex_type_impl = NULL;
 
@@ -396,7 +396,7 @@
 xml_schema_any_attribute_t* AXIS2_CALL
 xml_schema_complex_type_get_any_attribute(
     void *cmp_type,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_type)->any_attr;
 }
@@ -404,7 +404,7 @@
 axis2_status_t  AXIS2_CALL
 xml_schema_complex_type_set_any_attribute(
     void *cmp_type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_any_attribute_t *any_attr)
 {
     xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
@@ -421,7 +421,7 @@
 xml_schema_obj_collection_t* AXIS2_CALL
 xml_schema_complex_type_get_attributes(
     void *cmp_type,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_type)->attributes;
 }
@@ -429,7 +429,7 @@
 xml_schema_obj_table_t* AXIS2_CALL
 xml_schema_complex_type_get_attribute_use(
     void *cmp_type,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_type)->attr_uses;
 }
@@ -437,7 +437,7 @@
 xml_schema_any_attribute_t* AXIS2_CALL
 xml_schema_complex_type_get_attribute_wildcard(
     void *cmp_type,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_type)->attr_wildcard;
 }
@@ -445,7 +445,7 @@
 xml_schema_derivation_method_t* AXIS2_CALL
 xml_schema_complex_type_get_block(
     void *cmp_type,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_type)->block;
 }
@@ -453,7 +453,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_type_set_block(
     void *cmp_type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_derivation_method_t *block)
 {
     xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
@@ -470,7 +470,7 @@
 xml_schema_derivation_method_t* AXIS2_CALL
 xml_schema_complex_type_get_block_resolved(
     void *cmp_type,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_type)->block_resolved;
 
@@ -479,7 +479,7 @@
 void* AXIS2_CALL
 xml_schema_complex_type_get_content_model(
     void *cmp_type,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_type)->content_model;
 
@@ -488,7 +488,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_type_set_content_model(
     void *cmp_type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *content_model)
 {
     xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
@@ -505,7 +505,7 @@
 xml_schema_content_type_t* AXIS2_CALL
 xml_schema_complex_type_get_content_type(
     void *cmp_type,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_type)->content_type;
 }
@@ -513,7 +513,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_type_set_content_type(
     void *cmp_type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_content_type_t *content_type)
 {
     xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
@@ -530,7 +530,7 @@
 xml_schema_particle_t * AXIS2_CALL
 xml_schema_complex_type_get_content_type_particle(
     void *cmp_type,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_type)->particle_type;
 }
@@ -538,7 +538,7 @@
 axis2_bool_t AXIS2_CALL
 xml_schema_complex_type_is_abstract(
     void *cmp_type,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_type)->is_abstract;
 }
@@ -546,7 +546,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_type_set_abstract(
     void *cmp_type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t b)
 {
     AXIS2_INTF_TO_IMPL(cmp_type)->is_abstract = b;
@@ -556,7 +556,7 @@
 axis2_bool_t AXIS2_CALL
 xml_schema_complex_type_is_mixed(
     void *cmp_type,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_type)->is_mixed;
 }
@@ -564,7 +564,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_type_set_mixed(
     void *cmp_type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t b)
 {
     AXIS2_INTF_TO_IMPL(cmp_type)->is_mixed = b;
@@ -574,7 +574,7 @@
 void* AXIS2_CALL
 xml_schema_complex_type_get_particle(
     void *cmp_type,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_type)->particle;
 }
@@ -582,7 +582,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_complex_type_set_particle(
     void *cmp_type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *particle)
 {
     xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
@@ -600,7 +600,7 @@
 axis2_char_t* AXIS2_CALL
 xml_schema_complex_type_to_string(
     void *complex_type,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix,
     int tab)
 {
@@ -614,7 +614,7 @@
 xml_schema_types_t AXIS2_CALL
 xml_schema_complex_type_get_type(
     void *complex_type,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(complex_type)->obj_type;
 }
@@ -622,7 +622,7 @@
 axis2_hash_t* AXIS2_CALL
 xml_schema_complex_type_super_objs(
     void *complex_type,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(complex_type)->ht_super;
 }

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c Fri Mar 30 10:26:22 2007
@@ -45,29 +45,29 @@
 axis2_status_t AXIS2_CALL
 xml_schema_content_processing_free(
     void *content_processing,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_hash_t *AXIS2_CALL
 xml_schema_content_processing_super_objs(
     void *content_processing,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_content_processing_get_type(
     void *content_processing,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_enum_t *AXIS2_CALL
 xml_schema_content_processing_get_base_impl(void *content_processing,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axutil_array_list_t *AXIS2_CALL
 xml_schema_content_processing_get_values(void *content_processing,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
 AXIS2_EXTERN xml_schema_content_processing_t * AXIS2_CALL
-xml_schema_content_processing_create(const axis2_env_t *env,
+xml_schema_content_processing_create(const axutil_env_t *env,
         const axis2_char_t *value)
 {
     xml_schema_content_processing_impl_t *content_processing_impl = NULL;
@@ -157,7 +157,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_content_processing_free(void *content_processing,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_content_processing_impl_t *content_processing_impl = NULL;
 
@@ -218,7 +218,7 @@
 axis2_hash_t *AXIS2_CALL
 xml_schema_content_processing_super_objs(
     void *content_processing,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_content_processing_impl_t *content_processing_impl = NULL;
 
@@ -231,7 +231,7 @@
 xml_schema_types_t AXIS2_CALL
 xml_schema_content_processing_get_type(
     void *content_processing,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_content_processing_impl_t *content_processing_impl = NULL;
 
@@ -244,7 +244,7 @@
 xml_schema_enum_t *AXIS2_CALL
 xml_schema_content_processing_get_base_impl(
     void *content_processing,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_content_processing_impl_t *content_processing_impl = NULL;
 
@@ -256,7 +256,7 @@
 
 axutil_array_list_t *AXIS2_CALL
 xml_schema_content_processing_get_values(void *content_processing,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_content_processing_impl_t *content_processing_impl = NULL;
     axis2_hash_t *super = NULL;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c Fri Mar 30 10:26:22 2007
@@ -45,29 +45,29 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_content_type_free(void *content_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_enum_t *AXIS2_CALL
 xml_schema_content_type_get_base_impl(void *content_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axutil_array_list_t *AXIS2_CALL
 xml_schema_content_type_get_values(void *content_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_content_type_get_type(void *content_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_hash_t* AXIS2_CALL
 xml_schema_content_type_super_objs(void *content_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
 
 
 AXIS2_EXTERN xml_schema_content_type_t * AXIS2_CALL
-xml_schema_content_type_create(const axis2_env_t *env,
+xml_schema_content_type_create(const axutil_env_t *env,
         axis2_char_t *value)
 {
     xml_schema_content_type_impl_t *content_type_impl = NULL;
@@ -156,7 +156,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_content_type_free(void *content_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_content_type_impl_t *content_type_impl = NULL;
 
@@ -204,7 +204,7 @@
 
 xml_schema_enum_t *AXIS2_CALL
 xml_schema_content_type_get_base_impl(void *content_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_content_type_impl_t *content_type_impl = NULL;
 
@@ -215,21 +215,21 @@
 
 axutil_array_list_t* AXIS2_CALL
 xml_schema_content_type_get_values(void *content_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(content_type)->members;
 }
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_content_type_get_type(void *content_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(content_type)->obj_type;
 }
 
 axis2_hash_t* AXIS2_CALL
 xml_schema_content_type_super_objs(void *content_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(content_type)->ht_super;
 }

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c Fri Mar 30 10:26:22 2007
@@ -37,23 +37,23 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_data_type_free(void *data_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 void * AXIS2_CALL
 xml_schema_data_type_parse_value(void *data_type,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void *input);
 
 void *AXIS2_CALL
 xml_schema_data_type_value_type(void *data_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_tokenized_type_t *AXIS2_CALL
 xml_schema_data_type_tokenized_type(void *data_type,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 AXIS2_EXTERN xml_schema_data_type_t * AXIS2_CALL
-xml_schema_data_type_create(const axis2_env_t *env)
+xml_schema_data_type_create(const axutil_env_t *env)
 {
     xml_schema_data_type_impl_t *data_type_impl = NULL;
 
@@ -86,7 +86,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_data_type_free(void *data_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_data_type_impl_t *data_type_impl = NULL;
 
@@ -108,7 +108,7 @@
 
 void * AXIS2_CALL
 xml_schema_data_type_parse_value(void *data_type,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         void *input)
 {
     xml_schema_data_type_impl_t *data_type_impl = NULL;
@@ -120,7 +120,7 @@
 
 void *AXIS2_CALL
 xml_schema_data_type_value_type(void *data_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_data_type_impl_t *data_type_impl = NULL;
 
@@ -132,7 +132,7 @@
 
 xml_schema_tokenized_type_t *AXIS2_CALL
 xml_schema_data_type_tokenized_type(void *data_type,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_data_type_impl_t *data_type_impl = NULL;
 

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c Fri Mar 30 10:26:22 2007
@@ -45,29 +45,29 @@
 /************************* function prototypes ************************************/
 axis2_hash_t* AXIS2_CALL
 xml_schema_derivation_method_super_objs(void *derivation_method,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_derivation_method_get_type(void *derivation_method,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_derivation_method_free(void *derivation_method,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 xml_schema_enum_t *AXIS2_CALL
 xml_schema_derivation_method_get_base_impl(void *derivation_method,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axutil_array_list_t * AXIS2_CALL
 xml_schema_derivation_method_get_values(void *derivation_method,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 
 /************************** end function prototypes ********************************/
 
 AXIS2_EXTERN xml_schema_derivation_method_t * AXIS2_CALL
-xml_schema_derivation_method_create(const axis2_env_t *env,
+xml_schema_derivation_method_create(const axutil_env_t *env,
         axis2_char_t *value)
 {
     xml_schema_derivation_method_impl_t *derivation_method_impl = NULL;
@@ -171,7 +171,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_derivation_method_free(void *derivation_method,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_derivation_method_impl_t *derivation_method_impl = NULL;
 
@@ -223,7 +223,7 @@
 
 xml_schema_enum_t *AXIS2_CALL
 xml_schema_derivation_method_get_base_impl(void *derivation_method,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_derivation_method_impl_t *derivation_method_impl = NULL;
 
@@ -235,21 +235,21 @@
 
 axutil_array_list_t *AXIS2_CALL
 xml_schema_derivation_method_get_values(void *derivation_method,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(derivation_method)->members;
 }
 
 axis2_hash_t* AXIS2_CALL
 xml_schema_derivation_method_super_objs(void *derivation_method,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(derivation_method)->ht_super;
 }
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_derivation_method_get_type(void *derivation_method,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(derivation_method)->type;
 }

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c Fri Mar 30 10:26:22 2007
@@ -47,56 +47,56 @@
 axis2_status_t AXIS2_CALL
 xml_schema_documentation_free(
     void *documentation,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_hash_t *AXIS2_CALL
 xml_schema_documentation_super_objs(
     void *documentation,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_documentation_get_type(
     void *documentation,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_obj_t *AXIS2_CALL
 xml_schema_documentation_get_base_impl(void *documentation,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_char_t *AXIS2_CALL
 xml_schema_documentation_get_source(void *documentation,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_documentation_set_source(void *documentation,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *source);
 
 axiom_child_element_iterator_t *AXIS2_CALL
 xml_schema_documentation_get_markup(void *documentation,
-        const axis2_env_t *env);
+        const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_documentation_set_markup(
     void *documentation,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axiom_child_element_iterator_t *markup);
 
 axis2_status_t AXIS2_CALL
 xml_schema_documentation_set_language(
     void *documentation,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *language);
 
 axis2_char_t* AXIS2_CALL
 xml_schema_documentation_get_language(
     void *documentation,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 /****************** end macros ***********************************************/
 
 AXIS2_EXTERN xml_schema_documentation_t * AXIS2_CALL
-xml_schema_documentation_create(const axis2_env_t *env)
+xml_schema_documentation_create(const axutil_env_t *env)
 {
     xml_schema_documentation_impl_t *documentation_impl = NULL;
     axis2_status_t status = AXIS2_FAILURE;
@@ -191,7 +191,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_documentation_free(void *documentation,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_documentation_impl_t *documentation_impl = NULL;
 
@@ -239,7 +239,7 @@
 axis2_hash_t *AXIS2_CALL
 xml_schema_documentation_super_objs(
     void *documentation,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(documentation)->ht_super;
 }
@@ -247,7 +247,7 @@
 xml_schema_types_t AXIS2_CALL
 xml_schema_documentation_get_type(
     void *documentation,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(documentation)->obj_type;
 }
@@ -255,14 +255,14 @@
 xml_schema_obj_t *AXIS2_CALL
 xml_schema_documentation_get_base_impl(
     void *documentation,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(documentation)->schema_obj;
 }
 
 axis2_char_t *AXIS2_CALL
 xml_schema_documentation_get_source(void *documentation,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_documentation_impl_t *documentation_impl = NULL;
     axis2_hash_t *ht_super = NULL;
@@ -281,7 +281,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_documentation_set_source(void *documentation,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axis2_char_t *source)
 {
     xml_schema_documentation_impl_t *documentation_impl = NULL;
@@ -315,7 +315,7 @@
 
 axiom_child_element_iterator_t *AXIS2_CALL
 xml_schema_documentation_get_markup(void *documentation,
-        const axis2_env_t *env)
+        const axutil_env_t *env)
 {
     xml_schema_documentation_impl_t *documentation_impl = NULL;
     axis2_hash_t *ht_super = NULL;
@@ -333,7 +333,7 @@
 
 axis2_status_t AXIS2_CALL
 xml_schema_documentation_set_markup(void *documentation,
-        const axis2_env_t *env,
+        const axutil_env_t *env,
         axiom_child_element_iterator_t *markup)
 {
     xml_schema_documentation_impl_t *documentation_impl = NULL;
@@ -354,7 +354,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_documentation_set_language(
     void *documentation,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *language)
 {
     xml_schema_documentation_impl_t *documentation_impl = NULL;
@@ -374,7 +374,7 @@
 axis2_char_t* AXIS2_CALL
 xml_schema_documentation_get_language(
     void *documentation,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_documentation_impl_t *documentation_impl = NULL;
     documentation_impl = AXIS2_INTF_TO_IMPL(documentation);

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c?view=diff&rev=524188&r1=524187&r2=524188
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c Fri Mar 30 10:26:22 2007
@@ -119,199 +119,199 @@
 axis2_status_t AXIS2_CALL
 xml_schema_element_free(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_particle_t *AXIS2_CALL
 xml_schema_element_get_base_impl(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_types_t AXIS2_CALL
 xml_schema_element_get_type(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_hash_t *AXIS2_CALL
 xml_schema_element_super_objs(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 /**
  * Returns a collection of constraints on the element.
  */
 xml_schema_obj_collection_t *AXIS2_CALL
 xml_schema_element_get_constraints(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_char_t *AXIS2_CALL
 xml_schema_element_get_default_value(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_default_value(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *default_value);
 
 xml_schema_derivation_method_t *AXIS2_CALL
 xml_schema_element_get_block(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_block(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_derivation_method_t * block);
 
 xml_schema_derivation_method_t *AXIS2_CALL
 xml_schema_element_get_final(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_final(
     void *element,
-    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_element_get_block_resolved(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_char_t *AXIS2_CALL
 xml_schema_element_get_fixed_value(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_fixed_value(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *fixed_value);
 
 void *AXIS2_CALL
 xml_schema_element_get_element_type(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 xml_schema_form_t *AXIS2_CALL
 xml_schema_element_get_form(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_form(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_form_t *form);
 
 axis2_bool_t AXIS2_CALL
 xml_schema_element_is_abstract(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_abstract(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t is_abstract);
 
 axis2_bool_t AXIS2_CALL
 xml_schema_element_is_nillable(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_nillable(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t  is_nillable);
 
 axis2_char_t *AXIS2_CALL
 xml_schema_element_get_name(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_name(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *name);
 
 axis2_qname_t *AXIS2_CALL
 xml_schema_element_get_ref_qname(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_ref_qname(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *ref_qname);
 
 axis2_qname_t *AXIS2_CALL
 xml_schema_element_get_qname(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_qname(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *qualified_name);
 
 xml_schema_type_t *AXIS2_CALL
 xml_schema_element_get_schema_type(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_schema_type(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *schema_type);
 
 axis2_qname_t *AXIS2_CALL
 xml_schema_element_get_schema_type_qname(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_schema_type_qname(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *schema_type_qname);
 
 axis2_qname_t *AXIS2_CALL
 xml_schema_element_get_substitution_group(
     void *element,
-    const axis2_env_t *env);
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_substitution_group(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *substitution_group);
 
 axis2_char_t *AXIS2_CALL
 xml_schema_element_to_string(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix,
     int tab);
 
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_type(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_type_t *type);
 
 
 AXIS2_EXTERN xml_schema_element_t * AXIS2_CALL
-xml_schema_element_create(const axis2_env_t *env)
+xml_schema_element_create(const axutil_env_t *env)
 {
     xml_schema_element_impl_t *element_impl = NULL;
     xml_schema_annotated_t *annotated = NULL;
@@ -473,7 +473,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_element_free(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_element_impl_t *element_impl = NULL;
 
@@ -535,7 +535,7 @@
 xml_schema_particle_t *AXIS2_CALL
 xml_schema_element_get_base_impl(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_element_impl_t *element_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -546,7 +546,7 @@
 xml_schema_obj_collection_t *AXIS2_CALL
 xml_schema_element_get_constraints(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(element)->constraints;
 }
@@ -554,7 +554,7 @@
 axis2_char_t *AXIS2_CALL
 xml_schema_element_get_default_value(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(element)->default_value;
 }
@@ -562,7 +562,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_default_value(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *default_value)
 {
     xml_schema_element_impl_t *element_impl = NULL;
@@ -581,7 +581,7 @@
 xml_schema_derivation_method_t *AXIS2_CALL
 xml_schema_element_get_block(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(element)->block;
 }
@@ -589,7 +589,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_block(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_derivation_method_t * block)
 {
     xml_schema_element_impl_t *element_impl = NULL;
@@ -609,7 +609,7 @@
 xml_schema_derivation_method_t *AXIS2_CALL
 xml_schema_element_get_final(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(element)->final_derivation;
 }
@@ -617,7 +617,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_final(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_derivation_method_t *final_derivation)
 {
     xml_schema_element_impl_t *element_impl = NULL;
@@ -635,7 +635,7 @@
 xml_schema_derivation_method_t *AXIS2_CALL
 xml_schema_element_get_block_resolved(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(element)->final_derivation_resolved;
 }
@@ -643,7 +643,7 @@
 axis2_char_t *AXIS2_CALL
 xml_schema_element_get_fixed_value(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(element)->fixed_value;
 }
@@ -651,7 +651,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_fixed_value(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *fixed_value)
 {
     xml_schema_element_impl_t *element_impl = NULL;
@@ -669,7 +669,7 @@
 void *AXIS2_CALL
 xml_schema_element_get_element_type(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return NULL;
 }
@@ -677,7 +677,7 @@
 xml_schema_form_t *AXIS2_CALL
 xml_schema_element_get_form(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_element_impl_t *element_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -693,7 +693,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_form(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_form_t *form)
 {
     xml_schema_element_impl_t *element_impl = NULL;
@@ -711,7 +711,7 @@
 axis2_bool_t AXIS2_CALL
 xml_schema_element_is_abstract(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(element)->is_abstract;
 }
@@ -719,7 +719,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_abstract(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t is_abstract)
 {
     xml_schema_element_impl_t *element_impl = NULL;
@@ -732,7 +732,7 @@
 axis2_bool_t AXIS2_CALL
 xml_schema_element_is_nillable(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(element)->is_nillable;
 }
@@ -740,7 +740,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_nillable(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_bool_t  nillable)
 {
     xml_schema_element_impl_t *element_impl = NULL;
@@ -753,7 +753,7 @@
 axis2_char_t *AXIS2_CALL
 xml_schema_element_get_name(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(element)->name;
 }
@@ -761,7 +761,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_name(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *name)
 {
     xml_schema_element_impl_t *element_impl = NULL;
@@ -779,7 +779,7 @@
 axis2_qname_t *AXIS2_CALL
 xml_schema_element_get_ref_qname(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(element)->ref_qname;
 }
@@ -787,7 +787,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_ref_qname(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *ref_qname)
 {
     xml_schema_element_impl_t *element_impl = NULL;
@@ -805,7 +805,7 @@
 axis2_qname_t *AXIS2_CALL
 xml_schema_element_get_qname(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(element)->qualified_qname;
 }
@@ -813,7 +813,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_qname(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *qualified_name)
 {
     xml_schema_element_impl_t *element_impl = NULL;
@@ -831,7 +831,7 @@
 xml_schema_type_t *AXIS2_CALL
 xml_schema_element_get_schema_type(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     xml_schema_element_impl_t *element_impl = NULL;
     element_impl = AXIS2_INTF_TO_IMPL(element);
@@ -841,7 +841,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_schema_type(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     void *schema_type)
 {
     xml_schema_element_impl_t *element_impl = NULL;
@@ -858,7 +858,7 @@
 axis2_qname_t *AXIS2_CALL
 xml_schema_element_get_schema_type_qname(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(element)->schema_type_qname;
 }
@@ -866,7 +866,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_schema_type_qname(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *schema_type_qname)
 {
     xml_schema_element_impl_t *element_impl = NULL;
@@ -883,7 +883,7 @@
 axis2_qname_t *AXIS2_CALL
 xml_schema_element_get_substitution_group(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(element)->substitution_group;
 }
@@ -891,7 +891,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_substitution_group(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_qname_t *substitution_group)
 {
     xml_schema_element_impl_t *element_impl = NULL;
@@ -908,7 +908,7 @@
 axis2_char_t *AXIS2_CALL
 xml_schema_element_to_string(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     axis2_char_t *prefix,
     int tab)
 {
@@ -919,7 +919,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_element_set_type(
     void *element,
-    const axis2_env_t *env,
+    const axutil_env_t *env,
     xml_schema_type_t *type)
 {
     xml_schema_element_impl_t *element_impl = NULL;
@@ -936,7 +936,7 @@
 axis2_hash_t *AXIS2_CALL
 xml_schema_element_super_objs(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(element)->ht_super;
 }
@@ -944,7 +944,7 @@
 xml_schema_types_t AXIS2_CALL
 xml_schema_element_get_type(
     void *element,
-    const axis2_env_t *env)
+    const axutil_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(element)->obj_type;
 }



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