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 na...@apache.org on 2006/04/25 13:25:48 UTC

svn commit: r396847 - in /webservices/axis2/trunk/c: include/xml_schema/ modules/core/clientapi/ modules/core/deployment/ modules/xml/xml_schema/

Author: nandika
Date: Tue Apr 25 04:25:46 2006
New Revision: 396847

URL: http://svn.apache.org/viewcvs?rev=396847&view=rev
Log:
axis2_om_util files added , core files modified to remove compilation problems in win32

Added:
    webservices/axis2/trunk/c/include/xml_schema/axis2_om_util.h
    webservices/axis2/trunk/c/modules/xml/xml_schema/om_util.c
Modified:
    webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_constants.h
    webservices/axis2/trunk/c/modules/core/clientapi/call.c
    webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
    webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
    webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_derivation_method.c
    webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_form.c
    webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_group_ref.c
    webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_identity_constraint.c
    webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_obj_collection.c
    webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_use.c

Added: webservices/axis2/trunk/c/include/xml_schema/axis2_om_util.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/xml_schema/axis2_om_util.h?rev=396847&view=auto
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_om_util.h (added)
+++ webservices/axis2/trunk/c/include/xml_schema/axis2_om_util.h Tue Apr 25 04:25:46 2006
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef AXIS2_OM_UTIL.H
+#define AXIS2_OM_UTIL
+
+#include <axis2_array_list.h>
+#include <axis2_string.h>
+#include <axis2_om_element.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_first_child_element(axis2_om_element_t *ele,
+                                      axis2_env_t **env,
+                                      axis2_om_node_t *ele_node,
+                                      axis2_om_node_t **child_node);
+                                      
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_last_child_element(axis2_om_element_t *ele,
+                                     axis2_env_t **env,
+                                     axis2_om_node_t *ele_node,
+                                     axis2_om_node_t **child_node);
+                                     
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_next_sibling_element(axis2_om_element_t *ele,
+                                       axis2_env_t **env,
+                                       axis2_om_node_t *ele_node,
+                                       axis2_om_node_t **next_node);
+                                       
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_first_child_element_with_localname(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_om_node_t **child_node);
+                                             
+                                             
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_last_child_element_with_localname(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_om_node_t **child_node);
+                                                                                         
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_next_siblng_element_with_localname(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_om_node_t **next_node);
+                                             
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_first_child_element_with_uri_localname(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_char_t *uri,
+                                             axis2_om_node_t **child_node);                                                                                                                
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_last_child_element_with_uri_localname(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_char_t *uri,
+                                             axis2_om_node_t **child_node);                        AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_next_sibling_element_with_uri_localname(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_char_t *uri,
+                                             axis2_om_node_t **next_node); 
+                                             
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_first_child_element_with_localnames(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_array_list_t *names,
+                                             axis2_om_node_t **child_node);
+                                             
+                                             
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_last_child_element_with_localnames(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_array_list_t *names,
+                                             axis2_om_node_t **child_node);
+                                                                                         
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_next_siblng_element_with_localnames(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_array_list_t *names,
+                                             axis2_om_node_t **next_node); 
+                                             
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_first_child_element_with_localname_attr(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_char_t *attr_name,
+                                             axis2_char_t *attr_value,
+                                             axis2_om_node_t **child_node);
+                                             
+                                             
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_last_child_element_with_localname_attr(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_char_t *attr_name,
+                                             axis2_char_t *attr_value,
+                                             axis2_om_node_t **child_node);
+                                                                                         
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_next_siblng_element_with_localname_attr(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_char_t *attr_name,
+                                             axis2_char_t *attr_value,
+                                             axis2_om_node_t **next_node); 
+                                                                            
+AXIS2_DECLARE(axis2_char_t *)
+axis2_om_util_get_child_text(axis2_om_node_t *node,
+                             axis2_env_t **env);
+                             
+AXIS2_DECLARE(axis2_char_t *)
+axis2_om_util_get_localname(axis2_om_node_t *node,
+                            axis2_env_t **env);
+                            
+AXIS2_DECLARE(axis2_char_t *)
+axis2_om_util_get_node_namespace_uri(axis2_om_node_t *om_node,
+                                     axis2_env_t **env);                            
+                                                                                                                      
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* AXIS2_OM_UTIL */

Modified: webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_constants.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_constants.h?rev=396847&r1=396846&r2=396847&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_constants.h (original)
+++ webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_constants.h Tue Apr 25 04:25:46 2006
@@ -98,8 +98,28 @@
 #define XSD_ID "URI_2001_SCHEMA_XSD|ID"
 #define XSD_SCHEMA "URI_2001_SCHEMA_XSD|schema"
 
-/*********************************** Constants*********************************/	
-	
+/************End Constants  --  start block constants*****************************/	
+
+#define AXIS2_XML_SCHEMA_CONST_ALL "all"
+#define AXIS2_XML_SCHEMA_CONST_NONE "none"
+#define AXIS2_XML_SCHEMA_CONST_EXTENSION "extension"
+#define AXIS2_XML_SCHEMA_CONST_LIST "list"
+#define AXIS2_XML_SCHEMA_CONST_RESTRICTION "restriction"
+#define AXIS2_XML_SCHEMA_CONST_SUBSITUTION "substitution"
+#define AXIS2_XML_SCHEMA_CONST_UNION "union"
+#define AXIS2_XML_SCHEMA_CONST_EMPTY "empty"
+#define AXIS2_XML_SCHEMA_CONST_ELEMENT_ONLY "elementOnly"
+#define AXIS2_XML_SCHEMA_CONST_MIXED "mixed"
+#define AXIS2_XML_SCHEMA_CONST_TEXT_ONLY "textOnly"
+#define AXIS2_XML_SCHEMA_CONST_LAX "lax"
+#define AXIS2_XML_SCCHMA_CONST_SKIP "skip"
+#define AXIS2_XML_SCHEMA_CONST_STRICT "strict"
+#define AXIS2_XML_SCHEMA_CONST_OPTIONAL "optional"
+#define AXIS2_XML_SCHEMA_CONST_PROHIBITED "prohibited"
+#define AXIS2_XML_SCCHMA_CONST_REQUIRED "required"
+#define AXIS2_XML_SCHEMA_CONST_ERROR "error"
+#define AXIS2_XML_SCHEMA_CONST_WARNING "warning"
+
 	
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/modules/core/clientapi/call.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/call.c?rev=396847&r1=396846&r2=396847&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/call.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/call.c Tue Apr 25 04:25:46 2006
@@ -423,7 +423,7 @@
     {
         axis2_callback_t *callback = NULL;
         axis2_status_t status = AXIS2_FAILURE;
-        
+        long index = 0;
         axis2_char_t *address = NULL;
         axis2_char_t *epr_address = NULL;
         property = axis2_property_create(env);
@@ -434,7 +434,7 @@
         AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
                                     AXIS2_TRANSPORT_URL, property, AXIS2_FALSE);
         
-        long index = 0;
+        
         /* This means doing a Request-Response invocation using two channels. 
         If the transport is a two way transport (e.g. http), only one channel is used
         (e.g. in http cases 202 OK is sent to say no repsone avalible). 

Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?rev=396847&r1=396846&r2=396847&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Tue Apr 25 04:25:46 2006
@@ -72,7 +72,7 @@
                                     axis2_env_t **env,
                                     axis2_om_children_qname_iterator_t *trs_recvs);
                                     
-static axis2_status_t 
+axis2_status_t AXIS2_CALL
 axis2_conf_builder_process_default_module_versions(
                             axis2_conf_builder_t *conf_builder,
                             axis2_env_t **env, 

Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?rev=396847&r1=396846&r2=396847&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Tue Apr 25 04:25:46 2006
@@ -26,6 +26,7 @@
 #include <axis2_class_loader.h>
 #include <axis2_string.h>
 #include <axis2_utils.h>
+#include <axis2_core_utils.h>
 
 /** 
  * @brief DLL Description struct impl

Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?rev=396847&r1=396846&r2=396847&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Tue Apr 25 04:25:46 2006
@@ -229,7 +229,8 @@
         }
     }
     else
-    {*/
+    */
+    {
         axis2_arch_file_data_t *file_data = NULL;
         axis2_char_t *module_name = NULL;
         axis2_qname_t *module_qname = NULL;
@@ -242,7 +243,7 @@
         AXIS2_MODULE_DESC_SET_NAME(builder_impl->module_desc, env, module_qname);
         if(module_qname)
             AXIS2_QNAME_FREE(module_qname, env);
-    /*}*/
+    }
 
     /* Setting Module Dll Name , if it is there */
     

Added: webservices/axis2/trunk/c/modules/xml/xml_schema/om_util.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/om_util.c?rev=396847&view=auto
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/xml_schema/om_util.c (added)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/om_util.c Tue Apr 25 04:25:46 2006
@@ -0,0 +1,929 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+#include <axis2_om_node.h>
+#include <axis2_om_element.h>
+#include <axis2_array_list.h>
+
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_first_child_element(axis2_om_element_t *ele,
+                                      axis2_env_t **env,
+                                      axis2_om_node_t *ele_node,
+                                      axis2_om_node_t **child_node)
+{
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, *child_node, NULL);
+    return AXIS2_OM_ELEMENT_GET_FIRST_ELEMENT(ele, env, ele_node, child_node);
+}                                      
+                                      
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_last_child_element(axis2_om_element_t *ele,
+                                     axis2_env_t **env,
+                                     axis2_om_node_t *ele_node,
+                                     axis2_om_node_t **child_node)
+{
+    axis2_om_node_t *last_node = NULL;
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, *child_node, NULL);
+    last_node = AXIS2_OM_NODE_GET_LAST_CHILD(ele_node, env);
+    while(NULL != last_node)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(last_node, env) == AXIS2_OM_ELEMENT)
+        {
+            *child_node = last_node;
+            return (axis2_om_element_t*)
+                AXIS2_OM_NODE_GET_DATA_ELEMENT(last_node, env);
+        
+        }
+        last_node = AXIS2_OM_NODE_GET_PREVIOUS_SIBLING(ele_node, env);
+    }
+    return NULL;    
+}                                     
+                                     
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_next_sibling_element(axis2_om_element_t *ele,
+                                       axis2_env_t **env,
+                                       axis2_om_node_t *ele_node,
+                                       axis2_om_node_t **next_node)
+{
+    axis2_om_node_t *next_sibling = NULL;
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+
+    next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(ele_node, env);
+    while(NULL != next_sibling)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIS2_OM_ELEMENT)
+        {
+            *next_node = next_sibling;
+            return (axis2_om_element_t *)
+                AXIS2_OM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+        }
+        next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(next_sibling, env);
+    }
+    return NULL;
+}                                       
+                                       
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_first_child_element_with_localname(axis2_om_element_t *ele,
+                                             axis2_env_t **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_om_node_t **child_node)
+{
+    axis2_om_node_t *child = NULL;
+    axis2_om_node_t *next_sibling = NULL;
+    axis2_char_t *child_localname = NULL;
+    axis2_om_element_t *om_ele  = NULL;
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, *child_node, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, localname, NULL);
+    
+    child = AXIS2_OM_NODE_GET_FIRST_CHILD(ele_node, env);
+    if(NULL != child)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(child, env) == AXIS2_OM_ELEMENT)
+        {
+            om_ele = (axis2_om_element_t *)
+                        AXIS2_OM_NODE_GET_DATA_ELEMENT(child, env);
+            if(NULL != om_ele)
+            {
+                child_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                if(NULL != child_localname && AXIS2_STRCMP(child_localname, localname) == 0)
+                {
+                    *child_node = child;
+                    return om_ele;
+                }
+            }                        
+        }
+        om_ele = NULL;
+        child_localname = NULL;
+    }
+    
+    next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(child, env);
+    while(NULL != next_sibling)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIS2_OM_ELEMENT)
+        {
+            om_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+            if(NULL != om_ele)
+            {
+                child_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                if(NULL != child_localname && AXIS2_STRCMP(child_localname, localname) == 0)
+                {
+                    *child_node = next_sibling;
+                    return om_ele;
+                }
+            
+            }
+            om_ele = NULL;
+            child_localname = NULL;
+        }
+        next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(next_sibling, env);  
+    }  
+    return NULL;
+}                                             
+                                             
+                                             
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_last_child_element_with_localname(axis2_om_element_t *ele,
+                                             axis2_env_t **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_om_node_t **child_node)
+{
+    axis2_om_node_t *child = NULL;
+    axis2_om_element_t *om_ele = NULL;
+    axis2_char_t *child_localname = NULL;
+    
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, localname, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, *child_node, NULL);
+    
+    child = AXIS2_OM_NODE_GET_LAST_CHILD(ele_node, env);
+    while(NULL != child)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(child, env) == AXIS2_OM_ELEMENT)
+        {
+            om_ele = (axis2_om_element_t*)  
+                        AXIS2_OM_NODE_GET_DATA_ELEMENT(ele_node, env);
+            if(NULL != om_ele)
+            {
+                child_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                if(NULL != child_localname && 
+                    AXIS2_STRCMP(child_localname, localname) == 0)
+                {
+                    *child_node = child;
+                    return om_ele;
+                }
+            
+            }                      
+            om_ele = NULL;
+            child_localname = NULL;
+        }
+        child = AXIS2_OM_NODE_GET_PREVIOUS_SIBLING(child, env);                
+    }
+    return NULL;
+}                                             
+                                                                                         
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_next_siblng_element_with_localname(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_om_node_t **next_node)
+{
+    axis2_om_node_t *next_sibling = NULL;
+    axis2_om_element_t *om_ele    = NULL;
+    axis2_char_t *ele_localname   = NULL;
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+
+    next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(ele_node, env);
+    while(NULL != next_sibling)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIS2_OM_ELEMENT)
+        {
+            om_ele = (axis2_om_element_t *)
+                        AXIS2_OM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+            if(NULL != om_ele)
+            {
+                ele_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                if(NULL != ele_localname && AXIS2_STRCMP(localname, ele_localname) == 0)
+                {
+                    *next_node = next_sibling;
+                    return om_ele;
+                }
+            }
+            om_ele = NULL;
+            ele_localname = NULL;                        
+        }
+        next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(next_sibling, env);
+    }
+    return NULL;
+}                                             
+                                             
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_first_child_element_with_uri_localname(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_char_t *uri,
+                                             axis2_om_node_t **child_node)
+{
+    axis2_om_node_t *child = NULL;
+    axis2_om_node_t *next_sibling = NULL;
+    axis2_char_t *child_localname = NULL;
+    axis2_om_element_t *om_ele  = NULL;
+    axis2_om_namespace_t *ns    = NULL;
+    axis2_char_t *ns_uri        = NULL;
+    
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, *child_node, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, localname, NULL);
+     AXIS2_PARAM_CHECK((*env)->error, uri, NULL);
+     
+    child = AXIS2_OM_NODE_GET_FIRST_CHILD(ele_node, env);
+    if(NULL != child)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(ele_node, env) == AXIS2_OM_ELEMENT)
+        {
+            om_ele = (axis2_om_element_t *)
+                        AXIS2_OM_NODE_GET_DATA_ELEMENT(child , env);
+            if(NULL != om_ele)
+            {
+                child_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                ns              = AXIS2_OM_ELEMENT_GET_NAMESPACE(om_ele, env, child);
+                if(NULL != ns)
+                    ns_uri = AXIS2_OM_NAMESPACE_GET_URI(ns, env);
+                    
+                if((NULL != child_localname) && 
+                    (AXIS2_STRCMP(child_localname, localname) == 0) && (NULL != ns_uri) 
+                     && (AXIS2_STRCMP(ns_uri, uri) == 0))
+                {
+                    *child_node = child;
+                    return om_ele;
+                }
+            }                        
+        }
+        om_ele = NULL;
+        child_localname = NULL;
+        ns = NULL;
+        ns_uri = NULL;
+    }
+    
+    next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(child, env);
+    while(NULL != next_sibling)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIS2_OM_ELEMENT)
+        {
+            om_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+            if(NULL != om_ele)
+            {
+                child_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                ns              = AXIS2_OM_ELEMENT_GET_NAMESPACE(om_ele, env, next_sibling);
+                if(NULL != ns)
+                    ns_uri = AXIS2_OM_NAMESPACE_GET_URI(ns, env);
+                    
+                if((NULL != child_localname) && 
+                    (AXIS2_STRCMP(child_localname, localname) == 0) && (NULL != ns_uri) &&
+                    (AXIS2_STRCMP(ns_uri, uri) == 0))
+                {
+                    *child_node = next_sibling;
+                    return om_ele;
+                }
+            
+            }
+            om_ele = NULL;
+            child_localname = NULL;
+            ns = NULL;
+            ns_uri = NULL;
+        }
+        next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(next_sibling, env);  
+    }  
+    return NULL;
+}                                                                                                                                                             
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_last_child_element_with_uri_localname(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_char_t *uri,
+                                             axis2_om_node_t **child_node)
+{
+    axis2_om_node_t *child          = NULL;
+    axis2_om_element_t *om_ele      = NULL;
+    axis2_char_t *child_localname   = NULL;
+    axis2_om_namespace_t *ns        = NULL;
+    axis2_char_t *ns_uri            = NULL;
+               
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, localname, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, *child_node, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, uri, NULL);        
+    
+    child = AXIS2_OM_NODE_GET_LAST_CHILD(ele_node, env);
+    while(NULL != child)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(child, env) == AXIS2_OM_ELEMENT)
+        {
+            om_ele = (axis2_om_element_t*)  
+                        AXIS2_OM_NODE_GET_DATA_ELEMENT(ele_node, env);
+            if(NULL != om_ele)
+            {
+                ns = AXIS2_OM_ELEMENT_GET_NAMESPACE(om_ele, env, ele_node);
+                if(NULL != ns)
+                    ns_uri = AXIS2_OM_NAMESPACE_GET_URI(ns, env);
+                child_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                if(NULL != child_localname && 
+                    (AXIS2_STRCMP(child_localname, localname) == 0) && (NULL != ns_uri)
+                    && (AXIS2_STRCMP(ns_uri, uri) == 0))
+                {
+                    *child_node = child;
+                    return om_ele;
+                }
+            }                      
+            om_ele = NULL;
+            child_localname = NULL;
+            ns = NULL;
+            ns_uri = NULL;
+        }
+        child = AXIS2_OM_NODE_GET_PREVIOUS_SIBLING(child, env);                
+    }
+    return NULL;
+}
+                                             
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_next_sibling_element_with_uri_localname(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_char_t *uri,
+                                             axis2_om_node_t **next_node)
+{
+    axis2_om_node_t *next_sibling = NULL;
+    axis2_om_element_t *om_ele    = NULL;
+    axis2_char_t *ele_localname   = NULL;
+    axis2_om_namespace_t *ns      = NULL;
+    axis2_char_t *ns_uri          = NULL;
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+
+    next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(ele_node, env);
+    while(NULL != next_sibling)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIS2_OM_ELEMENT)
+        {
+            om_ele = (axis2_om_element_t *)
+                        AXIS2_OM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+            if(NULL != om_ele)
+            {
+                ns = AXIS2_OM_ELEMENT_GET_NAMESPACE(om_ele, env, next_sibling);
+                if(NULL != ns)
+                    ns_uri = AXIS2_OM_NAMESPACE_GET_URI(ns, env);
+                ele_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                if(NULL != ele_localname && 
+                    (AXIS2_STRCMP(localname, ele_localname) == 0) && (NULL != ns) 
+                    && (AXIS2_STRCMP(ns_uri, uri) == 0))
+                {
+                    *next_node = next_sibling;
+                    return om_ele;
+                }
+            }
+            om_ele = NULL;
+            ele_localname = NULL;
+            ns_uri = NULL;
+            ns = NULL; 
+        }
+        next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(next_sibling, env);
+    }
+    return NULL;
+}                                             
+                                             
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_first_child_element_with_localnames(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_array_list_t *names,
+                                             axis2_om_node_t **child_node)
+{
+    axis2_om_node_t *child = NULL;
+    axis2_om_node_t *next_sibling = NULL;
+    axis2_char_t *child_localname = NULL;
+    axis2_char_t *given_localname = NULL;
+    axis2_om_element_t *om_ele  = NULL;
+    int size = 0;
+    int i    = 0;
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, *child_node, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, names, NULL);
+    
+    child = AXIS2_OM_NODE_GET_FIRST_CHILD(ele_node, env);
+    if(NULL != child)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(child, env) == AXIS2_OM_ELEMENT)
+        {
+            om_ele = (axis2_om_element_t *)
+                        AXIS2_OM_NODE_GET_DATA_ELEMENT(child, env);
+            if(NULL != om_ele)
+            {
+                size = AXIS2_ARRAY_LIST_SIZE(names, env);
+                child_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+
+                for(i =0; i < size; i++)
+                {
+                    given_localname = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(names, env, i);
+                    
+                    if((NULL != child_localname) && (NULL != given_localname) && 
+                            AXIS2_STRCMP(child_localname, given_localname) == 0)
+                    {
+                        *child_node = child;
+                        return om_ele;
+                    }
+                    given_localname = NULL;
+                }                    
+            }                        
+        }
+        om_ele = NULL;
+        child_localname = NULL;
+        given_localname = NULL;
+        size = 0;
+    }
+    
+    next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(child, env);
+    while(NULL != next_sibling)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIS2_OM_ELEMENT)
+        {
+            om_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+            if(NULL != om_ele)
+            {
+                size = AXIS2_ARRAY_LIST_SIZE(names, env);
+                child_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                for(i = 0; i < size; i++)
+                {
+                    given_localname = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(names, env, i);
+                    if((NULL != child_localname) && (NULL != given_localname) && 
+                        (AXIS2_STRCMP(child_localname, given_localname) == 0))
+                    {
+                        *child_node = next_sibling;
+                        return om_ele;
+                    }
+                    given_localname = NULL;
+                }
+            }
+            om_ele = NULL;
+            child_localname = NULL;
+            given_localname = NULL;
+        }
+        next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(next_sibling, env);  
+    }  
+    return NULL;
+   
+}                                             
+                                             
+                                             
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_last_child_element_with_localnames(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_array_list_t *names,
+                                             axis2_om_node_t **child_node)
+{
+    axis2_om_node_t *child = NULL;
+    axis2_om_element_t *om_ele = NULL;
+    axis2_char_t *child_localname = NULL;
+    axis2_char_t *given_localname = NULL;
+    int size = 0;
+    int i = 0;
+    
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, names, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, *child_node, NULL);
+    
+    child = AXIS2_OM_NODE_GET_LAST_CHILD(ele_node, env);
+    while(NULL != child)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(child, env) == AXIS2_OM_ELEMENT)
+        {
+            om_ele = (axis2_om_element_t*)  
+                        AXIS2_OM_NODE_GET_DATA_ELEMENT(ele_node, env);
+            if(NULL != om_ele)
+            {
+                size = AXIS2_ARRAY_LIST_SIZE(names, env);
+                for(i = 0; i < size; i++)
+                {
+                    given_localname = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(names, env, i);
+                    child_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                    if(NULL != child_localname && (NULL != given_localname) &&
+                        (AXIS2_STRCMP(child_localname, given_localname) == 0))
+                    {
+                        *child_node = child;    
+                        return om_ele;
+                    }
+                }
+            }                      
+            om_ele = NULL;
+            child_localname = NULL;
+            given_localname = NULL;
+        }
+        child = AXIS2_OM_NODE_GET_PREVIOUS_SIBLING(child, env);                
+    }
+    return NULL;
+}                                             
+                                                                                         
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_next_siblng_element_with_localnames(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_array_list_t *names,
+                                             axis2_om_node_t **next_node)
+{
+    axis2_om_node_t *next_sibling = NULL;
+    axis2_om_element_t *om_ele    = NULL;
+    axis2_char_t *ele_localname   = NULL;
+    axis2_char_t *given_localname = NULL;
+    int size = 0;
+    int i    = 0;
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, names, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, *next_node, NULL);
+    
+
+    next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(ele_node, env);
+    while(NULL != next_sibling)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIS2_OM_ELEMENT)
+        {
+            om_ele = (axis2_om_element_t *)
+                    AXIS2_OM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+            if(NULL != om_ele)
+            {
+                size = AXIS2_ARRAY_LIST_SIZE(names, env);
+                for(i = 0; i < size; i++)
+                {
+                    given_localname = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(names, env, i);
+                    ele_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                    if((NULL != ele_localname) && (NULL != given_localname) && 
+                        (AXIS2_STRCMP(given_localname, ele_localname) == 0))
+                    {
+                        *next_node = next_sibling;
+                        return om_ele;
+                    }
+                
+                }
+            }
+            om_ele = NULL;
+            ele_localname = NULL;                        
+        }
+        next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(next_sibling, env);
+    }
+    return NULL;    
+}                                              
+                                             
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_first_child_element_with_localname_attr(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_char_t *attr_name,
+                                             axis2_char_t *attr_value,
+                                             axis2_om_node_t **child_node)
+{
+    axis2_om_node_t *child          = NULL;
+    axis2_om_node_t *next_sibling   = NULL;
+    axis2_char_t *child_localname   = NULL;
+    axis2_om_element_t *om_ele      = NULL;
+    axis2_om_attribute_t *om_attr   = NULL;
+    axis2_hash_t *attr_ht           = NULL;
+    axis2_hash_index_t *hi          = NULL; 
+    axis2_char_t *om_attr_value     = NULL;
+    axis2_char_t *om_attr_name      = NULL;
+   
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, *child_node, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, localname, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, attr_name, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, attr_value, NULL);
+    
+    child = AXIS2_OM_NODE_GET_FIRST_CHILD(ele_node, env);
+
+    if(NULL != child)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(child, env) == AXIS2_OM_ELEMENT)
+        {
+            om_ele = (axis2_om_element_t *)
+                        AXIS2_OM_NODE_GET_DATA_ELEMENT(child, env);
+            if(NULL != om_ele)
+            {
+                
+                child_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                if(NULL != child_localname && AXIS2_STRCMP(child_localname, localname) == 0)
+                {
+                    attr_ht = AXIS2_OM_ELEMENT_GET_ALL_ATTRIBUTES(om_ele, env);
+                    if(NULL != attr_ht)
+                    {
+                        
+                        for( hi = axis2_hash_first(attr_ht, env);  hi;
+                                hi = axis2_hash_next(env, hi))
+                        {
+                            void *val = NULL;
+                            axis2_hash_this(hi, NULL, NULL, &val);
+                            if(NULL != val)
+                            {
+                                om_attr = (axis2_om_attribute_t *)val;
+                                om_attr_name = 
+                                    AXIS2_OM_ATTRIBUTE_GET_LOCALNAME(om_attr, env);
+                                    
+                                om_attr_value =
+                                    AXIS2_OM_ATTRIBUTE_GET_VALUE(om_attr, env); 
+                                if(NULL != om_attr_name && NULL != om_attr_value &&
+                                AXIS2_STRCMP(om_attr_name, attr_name) == 0 &&
+                                AXIS2_STRCMP(om_attr_value, attr_value) == 0)
+                                {
+                                    AXIS2_FREE((*env)->allocator, hi);
+                                    *child_node = child;
+                                    return om_ele;
+                                }
+                                om_attr = NULL;
+                                om_attr_name = NULL;
+                                om_attr_value = NULL;                                                                             }
+                        }                                
+                    }
+                }
+            }                        
+        }
+        om_ele = NULL;
+        child_localname = NULL;
+        hi = NULL;
+    }
+
+    next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(child, env);
+    while(NULL != next_sibling)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIS2_OM_ELEMENT)
+        {
+            om_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+            if(NULL != om_ele)
+            {
+                child_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                if(NULL != child_localname && AXIS2_STRCMP(child_localname, localname) == 0)
+                {
+                    attr_ht = AXIS2_OM_ELEMENT_GET_ALL_ATTRIBUTES(om_ele, env);
+                    if(NULL != attr_ht)
+                    {
+                        
+                        for( hi = axis2_hash_first(attr_ht, env);  hi;
+                                hi = axis2_hash_next(env, hi))
+                        {
+                            void *val = NULL;
+                            axis2_hash_this(hi, NULL, NULL, &val);
+                            if(NULL != val)
+                            {
+                                om_attr = (axis2_om_attribute_t *)val;
+                                om_attr_name = 
+                                    AXIS2_OM_ATTRIBUTE_GET_LOCALNAME(om_attr, env);
+                                    
+                                om_attr_value =
+                                    AXIS2_OM_ATTRIBUTE_GET_VALUE(om_attr, env); 
+                    
+                                if(NULL != om_attr_name && NULL != om_attr_value &&
+                                AXIS2_STRCMP(om_attr_name, attr_name) == 0 &&
+                                AXIS2_STRCMP(om_attr_value, attr_value) == 0)
+                                {
+                                    *child_node = child;
+                                    return om_ele;
+                                }
+                                om_attr = NULL;
+                                om_attr_name = NULL;
+                                om_attr_value = NULL;   
+                            }
+                        }                                
+                    }
+                }
+            
+            }
+            om_ele = NULL;
+            child_localname = NULL;
+        }
+        next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(next_sibling, env);  
+    }  
+    return NULL;
+}                                             
+                                             
+                                             
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_last_child_element_with_localname_attr(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_char_t *attr_name,
+                                             axis2_char_t *attr_value,
+                                             axis2_om_node_t **child_node)
+{
+    axis2_om_node_t *child = NULL;
+    axis2_om_element_t *om_ele = NULL;
+    axis2_char_t *child_localname = NULL;
+    axis2_om_attribute_t *om_attr = NULL;
+    axis2_char_t *om_attr_name = NULL;
+    axis2_char_t *om_attr_value = NULL;
+    axis2_hash_index_t *hi      = NULL;
+    axis2_hash_t *attr_ht       = NULL;
+    
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, localname, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, *child_node, NULL);
+    
+    child = AXIS2_OM_NODE_GET_LAST_CHILD(ele_node, env);
+    while(NULL != child)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(child, env) == AXIS2_OM_ELEMENT)
+        {
+            om_ele = (axis2_om_element_t*)  
+                        AXIS2_OM_NODE_GET_DATA_ELEMENT(ele_node, env);
+            if(NULL != om_ele)
+            {
+                child_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                if(NULL != child_localname && 
+                    AXIS2_STRCMP(child_localname, localname) == 0)
+                {
+                    attr_ht = AXIS2_OM_ELEMENT_GET_ALL_ATTRIBUTES(om_ele, env);
+                    if(NULL != attr_ht)
+                    {
+                        
+                        for( hi = axis2_hash_first(attr_ht, env);  hi;
+                                hi = axis2_hash_next(env, hi))
+                        {
+                            void *val = NULL;
+                            axis2_hash_this(hi, NULL, NULL, &val);
+                            if(NULL != val)
+                            {
+                                om_attr = (axis2_om_attribute_t *)val;
+                                om_attr_name = 
+                                    AXIS2_OM_ATTRIBUTE_GET_LOCALNAME(om_attr, env);
+                                    
+                                om_attr_value =
+                                    AXIS2_OM_ATTRIBUTE_GET_VALUE(om_attr, env); 
+                    
+                                if(NULL != om_attr_name && NULL != om_attr_value &&
+                                AXIS2_STRCMP(om_attr_name, attr_name) == 0 &&
+                                AXIS2_STRCMP(om_attr_value, attr_value) == 0)
+                                {
+                                    AXIS2_FREE((*env)->allocator, hi);
+                                    *child_node = child;
+                                    return om_ele;
+                                }
+                                om_attr = NULL;
+                                om_attr_name = NULL;
+                                om_attr_value = NULL;   
+                            }
+                        }                                
+                    }
+                }
+            
+            }                      
+            om_ele = NULL;
+            child_localname = NULL;
+        }
+        child = AXIS2_OM_NODE_GET_PREVIOUS_SIBLING(child, env);                
+    }
+    return NULL;
+}                                             
+                                                                                         
+AXIS2_DECLARE(axis2_om_element_t *)
+axis2_om_util_get_next_siblng_element_with_localname_attr(axis2_om_element_t *ele,
+                                             axis2_env_t  **env,
+                                             axis2_om_node_t *ele_node,
+                                             axis2_char_t *localname,
+                                             axis2_char_t *attr_name,
+                                             axis2_char_t *attr_value,
+                                             axis2_om_node_t **child_node)
+{
+    axis2_om_node_t *next_sibling = NULL;
+    axis2_om_element_t *om_ele    = NULL;
+    axis2_char_t *ele_localname   = NULL;
+    axis2_om_attribute_t *om_attr = NULL;
+    axis2_char_t *om_attr_value   = NULL;
+    axis2_char_t *om_attr_name    = NULL;
+    axis2_hash_t *attr_ht         = NULL;
+    axis2_hash_index_t *hi        = NULL;
+    
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+    
+    
+    next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(ele_node, env);
+    while(NULL != next_sibling)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIS2_OM_ELEMENT)
+        {
+            om_ele = (axis2_om_element_t *)
+                        AXIS2_OM_NODE_GET_DATA_ELEMENT(next_sibling, env);
+            if(NULL != om_ele)
+            {
+                ele_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                if(NULL != ele_localname && AXIS2_STRCMP(localname, ele_localname) == 0)
+                {
+                    attr_ht = AXIS2_OM_ELEMENT_GET_ALL_ATTRIBUTES(om_ele, env);
+                    if(NULL != attr_ht)
+                    {
+                        
+                        for( hi = axis2_hash_first(attr_ht, env);  hi;
+                                hi = axis2_hash_next(env, hi))
+                        {
+                            void *val = NULL;
+                            axis2_hash_this(hi, NULL, NULL, &val);
+                            if(NULL != val)
+                            {
+                                om_attr = (axis2_om_attribute_t *)val;
+                                om_attr_name = 
+                                    AXIS2_OM_ATTRIBUTE_GET_LOCALNAME(om_attr, env);
+                                    
+                                om_attr_value =
+                                    AXIS2_OM_ATTRIBUTE_GET_VALUE(om_attr, env); 
+                    
+                                if(NULL != om_attr_name && NULL != om_attr_value &&
+                                AXIS2_STRCMP(om_attr_name, attr_name) == 0 &&
+                                AXIS2_STRCMP(om_attr_value, attr_value) == 0)
+                                {
+                                    AXIS2_FREE((*env)->allocator, hi);
+                                    *child_node = next_sibling;
+                                    return om_ele;
+                                }
+                                om_attr = NULL;
+                                om_attr_name = NULL;
+                                om_attr_value = NULL;   
+                            }
+                        }                                
+                    }
+                }
+            }
+            om_ele = NULL;
+            ele_localname = NULL;                        
+        }
+        next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(next_sibling, env);
+    }
+    return NULL;
+}                                             
+                                                                            
+AXIS2_DECLARE(axis2_char_t *)
+axis2_om_util_get_child_node_text(axis2_om_node_t *om_node,
+                             axis2_env_t **env)
+{
+    axis2_om_element_t *om_ele = NULL;
+    AXIS2_ENV_CHECK(env , NULL);
+    if(NULL == om_node)
+        return NULL;
+    if(AXIS2_OM_NODE_GET_NODE_TYPE(om_node, env) != AXIS2_OM_ELEMENT)
+        return NULL;
+    
+    om_ele = (axis2_om_element_t *)
+             AXIS2_OM_NODE_GET_DATA_ELEMENT(om_node, env);
+    
+    if(NULL != om_ele)
+    {
+        return AXIS2_OM_ELEMENT_GET_TEXT(om_ele, env, om_node);
+    }
+    return NULL;
+}                             
+                             
+AXIS2_DECLARE(axis2_char_t *)
+axis2_om_util_get_localname(axis2_om_node_t *node,
+                            axis2_env_t **env)
+{
+    axis2_om_element_t *om_ele = NULL;
+    
+    AXIS2_ENV_CHECK(env, NULL);
+    if(NULL == node)
+        return NULL;
+    if(AXIS2_OM_NODE_GET_NODE_TYPE(node, env) != AXIS2_OM_ELEMENT)
+        return NULL;
+    om_ele = (axis2_om_element_t *)AXIS2_OM_NODE_GET_NODE_TYPE(node, env);
+    if(NULL != om_ele)
+        return AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+    return NULL;
+}                            
+    
+AXIS2_DECLARE(axis2_char_t *)
+axis2_om_util_get_node_namespace_uri(axis2_om_node_t *om_node,
+                                     axis2_env_t **env)
+{
+    axis2_om_element_t *om_ele = NULL;
+    axis2_om_namespace_t *om_ns   = NULL;
+    if(!om_node)
+        return NULL;
+    if(AXIS2_OM_NODE_GET_NODE_TYPE(om_node, env) == AXIS2_OM_ELEMENT)
+    {
+        om_ele = AXIS2_OM_NODE_GET_DATA_ELEMENT(om_node, env);
+        if(NULL == om_ele)
+            return NULL;
+        om_ns = AXIS2_OM_ELEMENT_GET_NAMESPACE(om_ele, env, om_node);
+        if(NULL != om_ns)
+            return AXIS2_OM_NAMESPACE_GET_URI(om_ns, env);                    
+    }        
+    return NULL;
+}                                                                             
\ No newline at end of file

Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_derivation_method.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_derivation_method.c?rev=396847&r1=396846&r2=396847&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_derivation_method.c (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_derivation_method.c Tue Apr 25 04:25:46 2006
@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
+#include <axis2_xml_schema_constants.h>
 #include <axis2_xml_schema_derivation_method.h>
 
+
 typedef struct axis2_xml_schema_derivation_method_impl 
                axis2_xml_schema_derivation_method_impl_t;
 
@@ -100,14 +102,29 @@
             &(derivation_method_impl->derivation_method), env);
         return NULL;
     }   
-    AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env, "All");
-    AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env, "Empty");
-    AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env, "Extension");
-    AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env, "List");
-    AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env, "None");
-    AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env, "Restriction");
-    AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env, "Substitution");
-    AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env, "Union");
+    AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env,
+        AXIS2_STRDUP("all", env));
+        
+    AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env, 
+        AXIS2_STRDUP("empty", env));
+        
+    AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env, 
+        AXIS2_STRDUP("extension", env));
+        
+    AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env,
+        AXIS2_STRDUP("list", env));
+        
+    AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env, 
+        AXIS2_STRDUP("none", env));
+        
+    AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env,
+        AXIS2_STRDUP("restriction", env));
+        
+    AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env,
+        AXIS2_STRDUP("substitution", env));
+        
+    AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env,
+        AXIS2_STRDUP("union", env));
 
     derivation_method_impl->methods = axis2_hash_make(env);
 

Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_form.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_form.c?rev=396847&r1=396846&r2=396847&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_form.c (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_form.c Tue Apr 25 04:25:46 2006
@@ -93,9 +93,9 @@
         axis2_xml_schema_form_free(&(form_impl->form), env);
         return NULL;
     }       
-    AXIS2_ARRAY_LIST_ADD(form_impl->members, env, AXIS2_XML_SCHEMA_NONE);
-    AXIS2_ARRAY_LIST_ADD(form_impl->members, env, AXIS2_XML_SCHEMA_QUALIFIED);
-    AXIS2_ARRAY_LIST_ADD(form_impl->members, env, AXIS2_XML_SCHEMA_UNQUALIFIED);
+    AXIS2_ARRAY_LIST_ADD(form_impl->members, env, "qualified");
+    AXIS2_ARRAY_LIST_ADD(form_impl->members, env, "unqualified");
+    AXIS2_ARRAY_LIST_ADD(form_impl->members, env, "none");
 
     form_impl->methods = axis2_hash_make(env);
     if(!form_impl->methods)

Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_group_ref.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_group_ref.c?rev=396847&r1=396846&r2=396847&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_group_ref.c (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_group_ref.c Tue Apr 25 04:25:46 2006
@@ -1,4 +1,4 @@
-/*
+ /*
  * Copyright 2004,2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_identity_constraint.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_identity_constraint.c?rev=396847&r1=396846&r2=396847&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_identity_constraint.c (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_identity_constraint.c Tue Apr 25 04:25:46 2006
@@ -1,4 +1,4 @@
-/*
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           /*
  * Copyright 2004,2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_obj_collection.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_obj_collection.c?rev=396847&r1=396846&r2=396847&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_obj_collection.c (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_obj_collection.c Tue Apr 25 04:25:46 2006
@@ -1,4 +1,4 @@
-/*
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
                                                                                                                                                                                                                                                                                                              /*
  * Copyright 2004,2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_use.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_use.c?rev=396847&r1=396846&r2=396847&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_use.c (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_use.c Tue Apr 25 04:25:46 2006
@@ -87,10 +87,10 @@
     use_impl->members = axis2_array_list_create(env, 0);
     if(!use_impl->members)
         return NULL;
-    AXIS2_ARRAY_LIST_ADD(use_impl->members, env, "None");
-    AXIS2_ARRAY_LIST_ADD(use_impl->members, env, "Optional");
-    AXIS2_ARRAY_LIST_ADD(use_impl->members, env, "Prohibited");
-    AXIS2_ARRAY_LIST_ADD(use_impl->members, env, "Required");
+    AXIS2_ARRAY_LIST_ADD(use_impl->members, env, "none");
+    AXIS2_ARRAY_LIST_ADD(use_impl->members, env, "optional");
+    AXIS2_ARRAY_LIST_ADD(use_impl->members, env, "prohibited");
+    AXIS2_ARRAY_LIST_ADD(use_impl->members, env, "required");
 
     use_impl->methods = axis2_hash_make(env);
     if(!use_impl->methods)