axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r412096 - in /webservices/axis2/trunk/c/woden: ./ include/woden/schema/ include/woden/util/ include/woden/wsdl20/ include/woden/wsdl20/xml/ src/ src/schema/ src/util/ src/wsdl20/ src/wsdl20/xml/
Date Tue, 06 Jun 2006 11:33:09 GMT
Author: damitha
Date: Tue Jun  6 04:33:08 2006
New Revision: 412096

URL: http://svn.apache.org/viewvc?rev=412096&view=rev
Log:
More work on Woden

Modified:
    webservices/axis2/trunk/c/woden/configure.ac
    webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_imported_schema.h
    webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_inlined_schema.h
    webservices/axis2/trunk/c/woden/include/woden/util/axis2_om_util.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_fault.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_desc_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentation_element.h
    webservices/axis2/trunk/c/woden/src/Makefile.am
    webservices/axis2/trunk/c/woden/src/schema/imported_schema.c
    webservices/axis2/trunk/c/woden/src/schema/inlined_schema.c
    webservices/axis2/trunk/c/woden/src/util/Makefile.am
    webservices/axis2/trunk/c/woden/src/util/om_util.c
    webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am
    webservices/axis2/trunk/c/woden/src/wsdl20/desc.c
    webservices/axis2/trunk/c/woden/src/wsdl20/interface.c
    webservices/axis2/trunk/c/woden/src/wsdl20/interface_fault.c
    webservices/axis2/trunk/c/woden/src/wsdl20/xml/desc_element.c

Modified: webservices/axis2/trunk/c/woden/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/configure.ac?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/configure.ac (original)
+++ webservices/axis2/trunk/c/woden/configure.ac Tue Jun  6 04:33:08 2006
@@ -126,7 +126,9 @@
     src/wsdl20/xml/Makefile \
     src/wsdl20/enumeration/Makefile \
     src/wsdl20/extensions/Makefile \
-    src/wsdl20/extensions/soap/Makefile
+    src/wsdl20/extensions/soap/Makefile \
+    src/builder/Makefile \
+    test/Makefile
     ])
     
 AC_OUTPUT

Modified: webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_imported_schema.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_imported_schema.h?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_imported_schema.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_imported_schema.h Tue Jun  6 04:33:08 2006
@@ -51,11 +51,6 @@
             void *schema,
             const axis2_env_t *env);
     
-    axis2_status_t (AXIS2_CALL *
-    to_imported_schema_free) (
-            void *schema,
-            const axis2_env_t *env);
-
     axis2_woden_obj_types_t (AXIS2_CALL *
     type) (
             void *schema,
@@ -107,6 +102,9 @@
 
 #define AXIS2_WODEN_IMPORTED_SCHEMA_FREE(schema, env) \
       (((axis2_woden_imported_schema_t *) schema)->ops->free(schema, env))
+
+#define AXIS2_WODEN_IMPORTED_SCHEMA_TYPE(schema, env) \
+		(((axis2_woden_imported_schema_t *) schema)->ops->type(schema, env))
 
 #define AXIS2_WODEN_IMPORTED_SCHEMA_GET_BASE_IMPL(schema, env) \
       (((axis2_woden_imported_schema_t *) schema)->ops->get_base_impl(schema, \

Modified: webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_inlined_schema.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_inlined_schema.h?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_inlined_schema.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_inlined_schema.h Tue Jun  6 04:33:08 2006
@@ -51,11 +51,6 @@
             void *schema,
             const axis2_env_t *env);
     
-    axis2_status_t (AXIS2_CALL *
-    to_inlined_schema_free) (
-            void *schema,
-            const axis2_env_t *env);
-
     axis2_woden_obj_types_t (AXIS2_CALL *
     type) (
             void *schema,
@@ -107,6 +102,9 @@
 
 #define AXIS2_WODEN_INLINED_SCHEMA_FREE(schema, env) \
       (((axis2_woden_inlined_schema_t *) schema)->ops->free(schema, env))
+
+#define AXIS2_WODEN_INLINED_SCHEMA_TYPE(schema, env) \
+		(((axis2_woden_inlined_schema_t *) schema)->ops->type(schema, env))
 
 #define AXIS2_WODEN_INLINED_SCHEMA_GET_BASE_IMPL(schema, env) \
       (((axis2_woden_inlined_schema_t *) schema)->ops->get_base_impl(schema, \

Modified: webservices/axis2/trunk/c/woden/include/woden/util/axis2_om_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/util/axis2_om_util.h?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/util/axis2_om_util.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/util/axis2_om_util.h Tue Jun  6 04:33:08 2006
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_OM_UTIL.H
-#define AXIS2_OM_UTIL
+#ifndef AXIS2_OM_UTIL_H
+#define AXIS2_OM_UTIL_H
 
 #include <axis2_array_list.h>
 #include <axis2_string.h>
-#include <axis2_om_element.h>
+#include <axis2_om.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -27,6 +27,22 @@
 #endif
 
 AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
+axis2_om_util_get_first_child_element_with_uri(
+        axis2_om_node_t *ele_node,
+        const axis2_env_t *env,
+        axis2_char_t *uri,
+        axis2_om_node_t **child);
+        
+AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
+axis2_om_util_get_next_sibling_element_with_uri(
+        axis2_om_node_t *ele_node,
+        const axis2_env_t *env,
+        axis2_char_t *uri,
+        axis2_om_node_t **next_node);        
+
+
+
+AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
 axis2_om_util_get_first_child_element(axis2_om_element_t *ele,
                                       const axis2_env_t *env,
                                       axis2_om_node_t *ele_node,
@@ -148,9 +164,13 @@
 AXIS2_EXTERN axis2_char_t * AXIS2_CALL
 axis2_om_util_get_node_namespace_uri(axis2_om_node_t *om_node,
                                      const axis2_env_t *env);                            
-                                                                                                                      
-
+                                                                                             
+                         
+AXIS2_EXTERN axis2_om_child_element_iterator_t* AXIS2_CALL
+axis2_om_util_get_child_elements(axis2_om_element_t *om_ele, 
+                                 const axis2_env_t *env,
+                                 axis2_om_node_t *om_node);
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_OM_UTIL */
+#endif /* AXIS2_OM_UTIL_H */

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface.h?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface.h Tue Jun  6 04:33:08 2006
@@ -138,7 +138,22 @@
         const axis2_env_t *env);
 
 AXIS2_EXTERN axis2_woden_interface_t * AXIS2_CALL
+axis2_woden_interface_to_documentable(
+        void *interface,
+        const axis2_env_t *env);
+
+AXIS2_EXTERN axis2_woden_interface_t * AXIS2_CALL
 axis2_woden_interface_to_configurable(
+        void *interface,
+        const axis2_env_t *env);
+
+AXIS2_EXTERN axis2_woden_interface_t * AXIS2_CALL
+axis2_woden_interface_to_attr_extensible(
+        void *interface,
+        const axis2_env_t *env);
+
+AXIS2_EXTERN axis2_woden_interface_t * AXIS2_CALL
+axis2_woden_interface_to_element_extensible(
         void *interface,
         const axis2_env_t *env);
 

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_fault.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_fault.h?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_fault.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_fault.h Tue Jun  6 04:33:08 2006
@@ -85,6 +85,19 @@
             void *interface_fault,
             const axis2_env_t *env);
 
+    axis2_status_t (AXIS2_CALL *
+    set_element_declaration) (
+            void *interface_fault,
+            const axis2_env_t *env,
+            void *element_decl);
+
+    axis2_status_t (AXIS2_CALL *
+    set_types) (
+            void *interface_fault,
+            const axis2_env_t *env,
+            void *types);
+
+
 };
 
 union axis2_woden_interface_fault_base
@@ -111,6 +124,11 @@
         const axis2_env_t *env);
 
 AXIS2_EXTERN axis2_woden_interface_fault_t * AXIS2_CALL
+axis2_woden_interface_fault_to_nested_element(
+        void *interface_fault,
+        const axis2_env_t *env);
+
+AXIS2_EXTERN axis2_woden_interface_fault_t * AXIS2_CALL
 axis2_woden_interface_fault_to_nested_configurable(
         void *interface_fault,
         const axis2_env_t *env);
@@ -151,6 +169,14 @@
 #define AXIS2_WODEN_INTERFACE_FAULT_TO_ELEMENT(interface_fault, env) \
       (((axis2_woden_interface_fault_t *) interface_fault)->ops->\
          to_element(interface_fault, env))
+
+#define AXIS2_WODEN_INTERFACE_FAULT_SET_ELEMENT_DECLARATION(interface_fault, env, element_decl) \
+		(((axis2_woden_interface_fault_t *) interface_fault)->ops->\
+        set_element_declaration (interface_fault, env, element_decl))
+
+#define AXIS2_WODEN_INTERFACE_FAULT_SET_TYPES(interface_fault, env, types) \
+		(((axis2_woden_interface_fault_t *) interface_fault)->ops->\
+        set_types (interface_fault, env, types))
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_desc_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_desc_element.h?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_desc_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_desc_element.h Tue Jun  6 04:33:08 2006
@@ -309,13 +309,13 @@
             const axis2_env_t *env);
 
     axis2_status_t (AXIS2_CALL *
-    set_extension_registry) (
+    set_ext_registry) (
             void *desc_ele,
             const axis2_env_t *env,
             void *ext_reg);
     
     void *(AXIS2_CALL *
-    get_extension_registry) (
+    get_ext_registry) (
             void *desc_ele,
             const axis2_env_t *env);
 
@@ -504,13 +504,13 @@
       (((axis2_woden_desc_element_t *) desc_el)->ops->\
         get_svc_elements (desc_el, env))
 
-#define AXIS2_WODEN_DESC_ELEMENT_SET_EXTENSION_REGISTRY(desc_el, env, ext_reg) \
+#define AXIS2_WODEN_DESC_ELEMENT_SET_EXT_REGISTRY(desc_el, env, ext_reg) \
       (((axis2_woden_desc_element_t *) desc_el)->ops->\
-        set_extension_registry (desc_el, env, ext_reg))
+        set_ext_registry (desc_el, env, ext_reg))
 
-#define AXIS2_WODEN_DESC_ELEMENT_GET_EXTENSION_REGISTRY(desc_el, env) \
+#define AXIS2_WODEN_DESC_ELEMENT_GET_EXT_REGISTRY(desc_el, env) \
       (((axis2_woden_desc_element_t *) desc_el)->ops->\
-        get_extension_registry (desc_el, env))
+        get_ext_registry (desc_el, env))
 
 #define AXIS2_WODEN_DESC_ELEMENT_TO_COMPONENT(desc_el, env) \
       (((axis2_woden_desc_element_t *) desc_el)->ops->\

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentation_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentation_element.h?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentation_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentation_element.h Tue Jun  6 04:33:08 2006
@@ -64,17 +64,19 @@
             const axis2_env_t *env);
     
     axis2_woden_obj_types_t (AXIS2_CALL *
-    type) (void *doc_el,
+    type) (
+            void *doc_el,
             const axis2_env_t *env);
     
     axis2_status_t (AXIS2_CALL *
     set_content) (void *doc_el,
-                        const axis2_env_t *env,
-                        void *doc_elem);
+            const axis2_env_t *env,
+            void *doc_elem);
 
     void *(AXIS2_CALL *
-    get_content) (void *doc_el,
-                        const axis2_env_t *env);
+    get_content) (
+            void *doc_el,
+            const axis2_env_t *env);
 
 };
 

Modified: webservices/axis2/trunk/c/woden/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/Makefile.am?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/Makefile.am Tue Jun  6 04:33:08 2006
@@ -1 +1 @@
-SUBDIRS = util types schema xml wsdl20
+SUBDIRS = util types schema xml wsdl20 builder

Modified: webservices/axis2/trunk/c/woden/src/schema/imported_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/imported_schema.c?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/imported_schema.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/imported_schema.c Tue Jun  6 04:33:08 2006
@@ -104,6 +104,11 @@
 static axis2_woden_imported_schema_t *
 create(const axis2_env_t *env);
 
+static axis2_status_t
+axis2_woden_imported_schema_free_ops(
+        void *schema,
+        const axis2_env_t *env);
+
 /************************Woden C Internal Methods******************************/
 AXIS2_EXTERN axis2_woden_imported_schema_t * AXIS2_CALL
 axis2_woden_imported_schema_to_schema(
@@ -120,6 +125,9 @@
     }
     else
         schema_impl = (axis2_woden_imported_schema_impl_t *) schema;
+
+    axis2_woden_imported_schema_free_ops(schema, env);
+            
     schema_impl->imported_schema.schema.ops = 
             AXIS2_MALLOC(env->allocator, 
             sizeof(axis2_woden_schema_ops_t));
@@ -129,23 +137,6 @@
     return schema;
 }
 
-axis2_status_t AXIS2_CALL
-axis2_woden_imported_schema_to_schema_free(
-        void *schema,
-        const axis2_env_t *env)
-{
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    schema_impl = INTF_TO_IMPL(schema);
-
-    if(schema_impl->imported_schema.schema.ops)
-    {
-        AXIS2_FREE(env->allocator, schema_impl->imported_schema.schema.ops);
-        schema_impl->imported_schema.schema.ops = NULL;
-    }
-    return AXIS2_SUCCESS;
-}
 /************************End of Woden C Internal Methods***********************/
 
 static axis2_woden_imported_schema_t *
@@ -189,8 +180,6 @@
     }
     axis2_hash_set(schema_impl->methods, "free", 
             AXIS2_HASH_KEY_STRING, axis2_woden_imported_schema_free);
-    axis2_hash_set(schema_impl->methods, "to_schema_free", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_imported_schema_to_schema_free);
     axis2_hash_set(schema_impl->methods, "type", 
             AXIS2_HASH_KEY_STRING, axis2_woden_imported_schema_type);
     axis2_hash_set(schema_impl->methods, "set_location", 
@@ -240,6 +229,26 @@
     return schema_impl->obj_type;
 }
 
+static axis2_status_t
+axis2_woden_imported_schema_free_ops(
+        void *schema,
+        const axis2_env_t *env)
+{
+    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    schema_impl = INTF_TO_IMPL(schema);
+
+    if(schema_impl->imported_schema.schema.ops)
+    {
+        AXIS2_FREE(env->allocator, schema_impl->imported_schema.schema.ops);
+        schema_impl->imported_schema.schema.ops = NULL;
+    }
+
+    return AXIS2_SUCCESS;
+}
+
+
 axis2_status_t AXIS2_CALL
 axis2_woden_imported_schema_free(
         void *schema,
@@ -267,12 +276,8 @@
         AXIS2_WODEN_SCHEMA_FREE(schema_impl->schema, env);
         schema_impl->schema = NULL;
     }
-    
-    if(schema_impl->imported_schema.schema.ops)
-    {
-        AXIS2_FREE(env->allocator, schema_impl->imported_schema.schema.ops);
-        schema_impl->imported_schema.schema.ops = NULL;
-    }
+
+    axis2_woden_imported_schema_free_ops(schema, env);
 
     if((&(schema_impl->imported_schema))->ops)
     {
@@ -312,11 +317,9 @@
     
     schema->ops->free = 
                 axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
-    schema->ops->to_imported_schema_free = 
-                axis2_hash_get(methods, "to_imported_schema_free", 
-                AXIS2_HASH_KEY_STRING);
     schema->ops->type = 
                 axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING);
+
     schema->ops->set_location = axis2_hash_get(methods, "set_location", 
             AXIS2_HASH_KEY_STRING);
     schema->ops->get_location = axis2_hash_get(methods, "get_location", 

Modified: webservices/axis2/trunk/c/woden/src/schema/inlined_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/inlined_schema.c?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/inlined_schema.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/inlined_schema.c Tue Jun  6 04:33:08 2006
@@ -104,6 +104,11 @@
 static axis2_woden_inlined_schema_t *
 create(const axis2_env_t *env);
 
+static axis2_status_t
+axis2_woden_inlined_schema_free_ops(
+        void *schema,
+        const axis2_env_t *env);
+
 /************************Woden C Internal Methods******************************/
 AXIS2_EXTERN axis2_woden_inlined_schema_t * AXIS2_CALL
 axis2_woden_inlined_schema_to_schema(
@@ -120,6 +125,9 @@
     }
     else
         schema_impl = (axis2_woden_inlined_schema_impl_t *) schema;
+
+    axis2_woden_inlined_schema_free_ops(schema, env);
+
     schema_impl->inlined_schema.schema.ops = 
             AXIS2_MALLOC(env->allocator, 
             sizeof(axis2_woden_schema_ops_t));
@@ -129,23 +137,6 @@
     return schema;
 }
 
-axis2_status_t AXIS2_CALL
-axis2_woden_inlined_schema_to_schema_free(
-        void *schema,
-        const axis2_env_t *env)
-{
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    schema_impl = INTF_TO_IMPL(schema);
-
-    if(schema_impl->inlined_schema.schema.ops)
-    {
-        AXIS2_FREE(env->allocator, schema_impl->inlined_schema.schema.ops);
-        schema_impl->inlined_schema.schema.ops = NULL;
-    }
-    return AXIS2_SUCCESS;
-}
 /************************End of Woden C Internal Methods***********************/
 
 static axis2_woden_inlined_schema_t *
@@ -175,12 +166,12 @@
         axis2_woden_inlined_schema_type;
     schema_impl->inlined_schema.ops->get_base_impl = 
         axis2_woden_inlined_schema_get_base_impl;
+
     schema_impl->inlined_schema.ops->set_id = 
         axis2_woden_inlined_schema_set_id;
     schema_impl->inlined_schema.ops->get_id = 
         axis2_woden_inlined_schema_get_id;
     
-    
     schema_impl->methods = axis2_hash_make(env);
     if(!schema_impl->methods) 
     {
@@ -189,10 +180,9 @@
     }
     axis2_hash_set(schema_impl->methods, "free", 
             AXIS2_HASH_KEY_STRING, axis2_woden_inlined_schema_free);
-    axis2_hash_set(schema_impl->methods, "to_schema_free", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_inlined_schema_to_schema_free);
     axis2_hash_set(schema_impl->methods, "type", 
             AXIS2_HASH_KEY_STRING, axis2_woden_inlined_schema_type);
+    
     axis2_hash_set(schema_impl->methods, "set_id", 
             AXIS2_HASH_KEY_STRING, axis2_woden_inlined_schema_set_id);
     axis2_hash_set(schema_impl->methods, "get_id", 
@@ -240,6 +230,26 @@
     return schema_impl->obj_type;
 }
 
+static axis2_status_t
+axis2_woden_inlined_schema_free_ops(
+        void *schema,
+        const axis2_env_t *env)
+{
+    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    schema_impl = INTF_TO_IMPL(schema);
+
+    if(schema_impl->inlined_schema.schema.ops)
+    {
+        AXIS2_FREE(env->allocator, schema_impl->inlined_schema.schema.ops);
+        schema_impl->inlined_schema.schema.ops = NULL;
+    }
+
+    return AXIS2_SUCCESS;
+}
+
+
 axis2_status_t AXIS2_CALL
 axis2_woden_inlined_schema_free(
         void *schema,
@@ -267,13 +277,9 @@
         AXIS2_WODEN_SCHEMA_FREE(schema_impl->schema, env);
         schema_impl->schema = NULL;
     }
-    
-    if(schema_impl->inlined_schema.schema.ops)
-    {
-        AXIS2_FREE(env->allocator, schema_impl->inlined_schema.schema.ops);
-        schema_impl->inlined_schema.schema.ops = NULL;
-    }
 
+    axis2_woden_inlined_schema_free_ops(schema, env);
+    
     if((&(schema_impl->inlined_schema))->ops)
     {
         AXIS2_FREE(env->allocator, (&(schema_impl->inlined_schema))->ops);
@@ -312,11 +318,9 @@
     
     schema->ops->free = 
                 axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
-    schema->ops->to_inlined_schema_free = 
-                axis2_hash_get(methods, "to_inlined_schema_free", 
-                AXIS2_HASH_KEY_STRING);
     schema->ops->type = 
                 axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING);
+
     schema->ops->set_id = axis2_hash_get(methods, "set_id", 
             AXIS2_HASH_KEY_STRING);
     schema->ops->get_id = axis2_hash_get(methods, "get_id", 

Modified: webservices/axis2/trunk/c/woden/src/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/Makefile.am?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/util/Makefile.am Tue Jun  6 04:33:08 2006
@@ -3,7 +3,8 @@
 
 libaxis2_woden_util_la_SOURCES = \
 								 om_util.c \
-								 generic_obj.c
+								 generic_obj.c \
+								 qname_util.c
 
 INCLUDES = -I$(top_builddir)/include \
 			@UTILINC@

Modified: webservices/axis2/trunk/c/woden/src/util/om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/om_util.c?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/om_util.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/om_util.c Tue Jun  6 04:33:08 2006
@@ -18,6 +18,95 @@
 #include <axis2_om_element.h>
 #include <axis2_array_list.h>
 
+
+AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
+axis2_om_util_get_first_child_element_with_uri(
+        axis2_om_node_t *ele_node,
+        const axis2_env_t *env,
+        axis2_char_t *uri,
+        axis2_om_node_t **child)
+{
+    axis2_om_node_t *child_node = NULL;
+    
+    if(!ele_node || !uri)
+    {
+        AXIS2_ERROR_SET(env->error, 
+            AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
+        return NULL;
+    }
+
+    child_node = AXIS2_OM_NODE_GET_FIRST_CHILD(ele_node, env);
+    while(NULL != child_node)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(child_node, env) == AXIS2_OM_ELEMENT)
+        {
+            axis2_om_element_t *child_ele = NULL;
+            axis2_om_namespace_t *ns = NULL;
+            
+            child_ele = (axis2_om_element_t*)
+                AXIS2_OM_NODE_GET_DATA_ELEMENT(child_node, env);
+            ns = AXIS2_OM_ELEMENT_GET_NAMESPACE(child_ele, env, child_node);
+            if(NULL != ns)
+            {
+                axis2_char_t *child_uri = NULL;
+                child_uri = AXIS2_OM_NAMESPACE_GET_URI(ns, env);
+                if(NULL != child_uri && AXIS2_STRCMP(child_uri, uri) == 0)
+                {
+                    (*child) = child_node;
+                    return child_ele;
+                }
+            }
+        }    
+        child_node = AXIS2_OM_NODE_GET_NEXT_SIBLING(child_node, env);
+    }
+    return NULL;
+}        
+        
+        
+AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
+axis2_om_util_get_next_sibling_element_with_uri(
+        axis2_om_node_t *ele_node,
+        const axis2_env_t *env,
+        axis2_char_t *uri,
+        axis2_om_node_t **next_node)
+{
+    axis2_om_node_t *next_sib_node = NULL;
+    if(!ele_node || !uri)
+    {
+        AXIS2_ERROR_SET(env->error, 
+            AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
+        return NULL;
+    }
+
+    next_sib_node = AXIS2_OM_NODE_GET_NEXT_SIBLING(ele_node, env);
+    while(NULL != next_sib_node)
+    {
+        if(AXIS2_OM_NODE_GET_NODE_TYPE(next_sib_node, env) == AXIS2_OM_ELEMENT)
+        {
+            axis2_om_element_t *sib_ele = NULL;
+            axis2_om_namespace_t *ns = NULL;
+            
+            sib_ele = (axis2_om_element_t*)
+                AXIS2_OM_NODE_GET_DATA_ELEMENT(next_sib_node, env);
+            ns = AXIS2_OM_ELEMENT_GET_NAMESPACE(sib_ele, env, next_sib_node);
+            if(NULL != ns)
+            {
+                axis2_char_t *sib_uri = NULL;
+                sib_uri = AXIS2_OM_NAMESPACE_GET_URI(ns, env);
+                if(NULL != sib_uri && AXIS2_STRCMP(sib_uri, uri) == 0)
+                {
+                    (*next_node) = next_sib_node;
+                    return sib_ele;
+                }
+            }
+        }    
+        next_sib_node = AXIS2_OM_NODE_GET_NEXT_SIBLING(next_sib_node, env);
+    }
+    return NULL;
+}        
+        
+        
+
 AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
 axis2_om_util_get_first_child_element(axis2_om_element_t *ele,
                                       const axis2_env_t *env,
@@ -26,7 +115,8 @@
 {
     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, child_node, NULL);
+    
     return AXIS2_OM_ELEMENT_GET_FIRST_ELEMENT(ele, env, ele_node, child_node);
 }                                      
                                       
@@ -39,7 +129,8 @@
     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);
+    AXIS2_PARAM_CHECK(env->error, child_node, NULL);
+    
     last_node = AXIS2_OM_NODE_GET_LAST_CHILD(ele_node, env);
     while(NULL != last_node)
     {
@@ -92,7 +183,7 @@
     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, child_node, NULL);
     AXIS2_PARAM_CHECK(env->error, localname, NULL);
     
     child = AXIS2_OM_NODE_GET_FIRST_CHILD(ele_node, env);
@@ -155,7 +246,7 @@
     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, child_node, NULL);
     
     child = AXIS2_OM_NODE_GET_LAST_CHILD(ele_node, env);
     while(NULL != child)
@@ -185,7 +276,7 @@
                                                                                          
 AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
 axis2_om_util_get_next_siblng_element_with_localname(axis2_om_element_t *ele,
-                                             const axis2_env_t  *env,
+                                             axis2_env_t  *env,
                                              axis2_om_node_t *ele_node,
                                              axis2_char_t *localname,
                                              axis2_om_node_t **next_node)
@@ -193,6 +284,7 @@
     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);
 
@@ -222,7 +314,7 @@
                                              
 AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
 axis2_om_util_get_first_child_element_with_uri_localname(axis2_om_element_t *ele,
-                                             const axis2_env_t  *env,
+                                             axis2_env_t  *env,
                                              axis2_om_node_t *ele_node,
                                              axis2_char_t *localname,
                                              axis2_char_t *uri,
@@ -237,38 +329,40 @@
     
     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, child_node, NULL);
     AXIS2_PARAM_CHECK(env->error, localname, NULL);
-     AXIS2_PARAM_CHECK(env->error, uri, NULL);
+    AXIS2_PARAM_CHECK(env->error, uri, NULL);
      
     child = AXIS2_OM_NODE_GET_FIRST_CHILD(ele_node, env);
-    if(NULL != child)
+    if(!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)
+        return NULL;
+        
+    }
+    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_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;
+                *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)
@@ -303,7 +397,7 @@
 }                                                                                                                                                             
 AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
 axis2_om_util_get_last_child_element_with_uri_localname(axis2_om_element_t *ele,
-                                             const axis2_env_t  *env,
+                                             axis2_env_t  *env,
                                              axis2_om_node_t *ele_node,
                                              axis2_char_t *localname,
                                              axis2_char_t *uri,
@@ -318,7 +412,7 @@
     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, child_node, NULL);
     AXIS2_PARAM_CHECK(env->error, uri, NULL);        
     
     child = AXIS2_OM_NODE_GET_LAST_CHILD(ele_node, env);
@@ -354,7 +448,7 @@
                                              
 AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
 axis2_om_util_get_next_sibling_element_with_uri_localname(axis2_om_element_t *ele,
-                                             const axis2_env_t  *env,
+                                             axis2_env_t  *env,
                                              axis2_om_node_t *ele_node,
                                              axis2_char_t *localname,
                                              axis2_char_t *uri,
@@ -401,7 +495,7 @@
                                              
 AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
 axis2_om_util_get_first_child_element_with_localnames(axis2_om_element_t *ele,
-                                             const axis2_env_t  *env,
+                                             axis2_env_t  *env,
                                              axis2_om_node_t *ele_node,
                                              axis2_array_list_t *names,
                                              axis2_om_node_t **child_node)
@@ -415,7 +509,7 @@
     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, child_node, NULL);
     AXIS2_PARAM_CHECK(env->error, names, NULL);
     
     child = AXIS2_OM_NODE_GET_FIRST_CHILD(ele_node, env);
@@ -485,7 +579,7 @@
                                              
 AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
 axis2_om_util_get_last_child_element_with_localnames(axis2_om_element_t *ele,
-                                             const axis2_env_t  *env,
+                                             axis2_env_t  *env,
                                              axis2_om_node_t *ele_node,
                                              axis2_array_list_t *names,
                                              axis2_om_node_t **child_node)
@@ -500,7 +594,7 @@
     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);
+    AXIS2_PARAM_CHECK(env->error, child_node, NULL);
     
     child = AXIS2_OM_NODE_GET_LAST_CHILD(ele_node, env);
     while(NULL != child)
@@ -535,7 +629,7 @@
                                                                                          
 AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
 axis2_om_util_get_next_siblng_element_with_localnames(axis2_om_element_t *ele,
-                                             const axis2_env_t  *env,
+                                             axis2_env_t  *env,
                                              axis2_om_node_t *ele_node,
                                              axis2_array_list_t *names,
                                              axis2_om_node_t **next_node)
@@ -549,7 +643,7 @@
     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);
+    AXIS2_PARAM_CHECK(env->error, next_node, NULL);
     
 
     next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(ele_node, env);
@@ -585,7 +679,7 @@
                                              
 AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
 axis2_om_util_get_first_child_element_with_localname_attr(axis2_om_element_t *ele,
-                                             const axis2_env_t  *env,
+                                             axis2_env_t  *env,
                                              axis2_om_node_t *ele_node,
                                              axis2_char_t *localname,
                                              axis2_char_t *attr_name,
@@ -604,7 +698,7 @@
    
     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, 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);
@@ -717,7 +811,7 @@
                                              
 AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
 axis2_om_util_get_last_child_element_with_localname_attr(axis2_om_element_t *ele,
-                                             const axis2_env_t  *env,
+                                             axis2_env_t  *env,
                                              axis2_om_node_t *ele_node,
                                              axis2_char_t *localname,
                                              axis2_char_t *attr_name,
@@ -736,7 +830,7 @@
     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, child_node, NULL);
     
     child = AXIS2_OM_NODE_GET_LAST_CHILD(ele_node, env);
     while(NULL != child)
@@ -796,7 +890,7 @@
                                                                                          
 AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
 axis2_om_util_get_next_siblng_element_with_localname_attr(axis2_om_element_t *ele,
-                                             const axis2_env_t  *env,
+                                             axis2_env_t  *env,
                                              axis2_om_node_t *ele_node,
                                              axis2_char_t *localname,
                                              axis2_char_t *attr_name,
@@ -924,6 +1018,24 @@
         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;
+} 
+
+AXIS2_EXTERN axis2_om_child_element_iterator_t* AXIS2_CALL
+axis2_om_util_get_child_elements(axis2_om_element_t *om_ele, 
+                                 const axis2_env_t *env,
+                                 axis2_om_node_t *om_node)
+{
+    axis2_om_element_t *first_ele = NULL;
+    axis2_om_node_t *first_node   = NULL;
+    AXIS2_PARAM_CHECK(env->error, om_node, NULL);
+    AXIS2_PARAM_CHECK(env->error, om_ele, NULL);
+    first_ele = 
+        AXIS2_OM_ELEMENT_GET_FIRST_ELEMENT(om_ele, env, om_node, &first_node);
+    if(NULL != first_ele)
+    {
+        return axis2_om_child_element_iterator_create(env, first_node);
     }        
     return NULL;
 }

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am Tue Jun  6 04:33:08 2006
@@ -1,7 +1,7 @@
 SUBDIRS = enumeration xml extensions
-noinst_LTLIBRARIES = libaxis2_woden_wsdl20.la
+lib_LTLIBRARIES = libwoden_wsdl20.la
 
-libaxis2_woden_wsdl20_la_SOURCES = \
+libwoden_wsdl20_la_SOURCES = \
 							wsdl_element.c \
 							wsdl_obj.c \
 							documentable.c \

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/desc.c?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/desc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/desc.c Tue Jun  6 04:33:08 2006
@@ -321,13 +321,13 @@
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_set_extension_registry(
+axis2_woden_desc_set_ext_registry(
         void *desc,
         const axis2_env_t *env,
         void *ext_reg);
 
 void *AXIS2_CALL
-axis2_woden_desc_get_extension_registry(
+axis2_woden_desc_get_ext_registry(
         void *desc,
         const axis2_env_t *env);
 
@@ -726,12 +726,12 @@
     axis2_hash_set(desc_impl->methods, "create_property_element", 
             AXIS2_HASH_KEY_STRING, 
             axis2_woden_desc_create_property_element);
-    axis2_hash_set(desc_impl->methods, "set_extension_registry", 
+    axis2_hash_set(desc_impl->methods, "set_ext_registry", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_set_extension_registry);
-    axis2_hash_set(desc_impl->methods, "get_extension_registry", 
+            axis2_woden_desc_set_ext_registry);
+    axis2_hash_set(desc_impl->methods, "get_ext_registry", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_extension_registry);
+            axis2_woden_desc_get_ext_registry);
     axis2_hash_set(desc_impl->methods, "to_component", 
             AXIS2_HASH_KEY_STRING, 
             axis2_woden_desc_to_component);
@@ -1562,130 +1562,130 @@
 axis2_woden_desc_create_documentation_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_documentation(env);
+    return axis2_woden_documentation_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_import_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_import(env);
+    return axis2_woden_import_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_include_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_include(env);
+    return axis2_woden_include_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_types_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_types(env);
+    return axis2_woden_types_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_interface_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_interface(env);
+    return axis2_woden_interface_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_interface_fault_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_interface_fault(env);
+    return axis2_woden_interface_fault_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_interface_op_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_interface_op(env);
+    return axis2_woden_interface_op_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_interface_fault_ref_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_interface_fault_ref(env);
+    return axis2_woden_interface_fault_ref_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_interface_msg_ref_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_interface_msg_ref(env);
+    return axis2_woden_interface_msg_ref_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_binding_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_binding(env);
+    return axis2_woden_binding_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_binding_fault_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_binding_fault(env);
+    return axis2_woden_binding_fault_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_binding_op_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_binding_op(env);
+    return axis2_woden_binding_op_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_binding_fault_ref_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_binding_fault_ref(env);
+    return axis2_woden_binding_fault_ref_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_binding_msg_ref_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_binding_msg_ref(env);
+    return axis2_woden_binding_msg_ref_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_svc_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_svc(env);
+    return axis2_woden_svc_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_endpoint_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_endpoint(env);
+    return axis2_woden_endpoint_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_feature_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_feature(env);
+    return axis2_woden_feature_create(env);
 }
 
 void *AXIS2_CALL
 axis2_woden_desc_create_property_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_property(env);
+    return axis2_woden_property_create(env);
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_set_extension_registry(
+axis2_woden_desc_set_ext_registry(
         void *desc,
         const axis2_env_t *env,
         void *ext_reg)
@@ -1708,7 +1708,7 @@
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_get_extension_registry(
+axis2_woden_desc_get_ext_registry(
         void *desc,
         const axis2_env_t *env)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/interface.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/interface.c?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/interface.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/interface.c Tue Jun  6 04:33:08 2006
@@ -245,6 +245,33 @@
 }
 
 AXIS2_EXTERN axis2_woden_interface_t * AXIS2_CALL
+axis2_woden_interface_to_documentable(
+        void *interface,
+        const axis2_env_t *env)
+{
+    axis2_woden_interface_impl_t *interface_impl = NULL;
+   
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    if(!interface)
+    {
+        interface_impl = (axis2_woden_interface_impl_t *) create(env);
+    }
+    else
+        interface_impl = (axis2_woden_interface_impl_t *) interface;
+
+    axis2_woden_interface_free_ops(interface, env);
+
+    interface_impl->interface.base.configurable.base.documentable.ops = 
+        AXIS2_MALLOC(env->allocator, 
+                sizeof(axis2_woden_documentable_ops_t));
+    axis2_woden_documentable_resolve_methods(&(interface_impl->interface.base.
+            configurable.base.documentable), env, NULL,
+            interface_impl->methods);
+    return interface;
+}
+
+
+AXIS2_EXTERN axis2_woden_interface_t * AXIS2_CALL
 axis2_woden_interface_to_configurable(
         void *interface,
         const axis2_env_t *env)
@@ -270,6 +297,62 @@
     return interface;
 }
 
+AXIS2_EXTERN axis2_woden_interface_t * AXIS2_CALL
+axis2_woden_interface_to_attr_extensible(
+        void *interface,
+        const axis2_env_t *env)
+{
+    axis2_woden_interface_impl_t *interface_impl = NULL;
+   
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    if(!interface)
+    {
+        interface_impl = (axis2_woden_interface_impl_t *) create(env);
+    }
+    else
+        interface_impl = (axis2_woden_interface_impl_t *) interface;
+
+    axis2_woden_interface_free_ops(interface, env);
+
+    interface_impl->interface.base.interface_element.base.documentable_element.
+        wsdl_element.base.attr_extensible.ops = 
+        AXIS2_MALLOC(env->allocator, 
+                sizeof(axis2_woden_attr_extensible_ops_t));
+    axis2_woden_attr_extensible_resolve_methods(&(interface_impl->interface.base.
+            interface_element.base.documentable_element.wsdl_element.base.
+            attr_extensible), env, NULL, interface_impl->methods);
+    return interface;
+}
+
+
+AXIS2_EXTERN axis2_woden_interface_t * AXIS2_CALL
+axis2_woden_interface_to_element_extensible(
+        void *interface,
+        const axis2_env_t *env)
+{
+    axis2_woden_interface_impl_t *interface_impl = NULL;
+   
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    if(!interface)
+    {
+        interface_impl = (axis2_woden_interface_impl_t *) create(env);
+    }
+    else
+        interface_impl = (axis2_woden_interface_impl_t *) interface;
+
+    axis2_woden_interface_free_ops(interface, env);
+
+    interface_impl->interface.base.interface_element.base.documentable_element.
+        wsdl_element.base.element_extensible.ops = 
+        AXIS2_MALLOC(env->allocator, 
+                sizeof(axis2_woden_element_extensible_ops_t));
+    axis2_woden_element_extensible_resolve_methods(&(interface_impl->interface.base.
+            interface_element.base.documentable_element.wsdl_element.base.
+            element_extensible), env, NULL, interface_impl->methods);
+    return interface;
+}
+
+
 /************************End of Woden C Internal Methods***********************/
 static axis2_woden_interface_t *
 create(const axis2_env_t *env)
@@ -292,8 +375,13 @@
     
     interface_impl->interface.base.interface_element.ops = NULL;
     interface_impl->interface.base.interface_element.base.documentable_element.ops = NULL;
+    interface_impl->interface.base.configurable.base.documentable.ops = NULL;
     interface_impl->interface.base.interface_element.base.configurable_element.ops = NULL;
     interface_impl->interface.base.configurable.ops = NULL;
+    interface_impl->interface.base.interface_element.base.documentable_element.
+        wsdl_element.base.attr_extensible.ops = NULL;
+    interface_impl->interface.base.interface_element.base.documentable_element.
+        wsdl_element.base.element_extensible.ops = NULL;
     
     interface_impl->interface.ops = AXIS2_MALLOC(env->allocator, 
             sizeof(axis2_woden_interface_ops_t));
@@ -436,7 +524,15 @@
         interface_impl->interface.base.interface_element.base.documentable_element.ops = 
             NULL;
     }
-    
+     
+    if(interface_impl->interface.base.configurable.base.documentable.ops)
+    {
+        AXIS2_FREE(env->allocator, interface_impl->interface.base.
+                configurable.base.documentable.ops);
+        interface_impl->interface.base.configurable.base.documentable.ops = 
+            NULL;
+    }
+
     if(interface_impl->interface.base.configurable.ops)
     {
         AXIS2_FREE(env->allocator, interface_impl->interface.base.
@@ -444,7 +540,27 @@
         interface_impl->interface.base.configurable.ops = 
             NULL;
     }
-    
+     
+    if(interface_impl->interface.base.interface_element.base.
+            documentable_element.wsdl_element.base.attr_extensible.ops)
+    {
+        AXIS2_FREE(env->allocator, interface_impl->interface.base.
+                interface_element.base.documentable_element.wsdl_element.base.
+                attr_extensible.ops);
+        interface_impl->interface.base.interface_element.base.
+            documentable_element.wsdl_element.base.attr_extensible.ops = NULL;
+    }
+      
+    if(interface_impl->interface.base.interface_element.base.
+            documentable_element.wsdl_element.base.element_extensible.ops)
+    {
+        AXIS2_FREE(env->allocator, interface_impl->interface.base.
+                interface_element.base.documentable_element.wsdl_element.base.
+                element_extensible.ops);
+        interface_impl->interface.base.interface_element.base.
+            documentable_element.wsdl_element.base.element_extensible.ops = NULL;
+    }
+
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/interface_fault.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/interface_fault.c?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/interface_fault.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/interface_fault.c Tue Jun  6 04:33:08 2006
@@ -210,6 +210,32 @@
     return interface_fault;
 }
 
+AXIS2_EXTERN axis2_woden_interface_fault_t * AXIS2_CALL
+axis2_woden_interface_fault_to_nested_element(
+        void *interface_fault,
+        const axis2_env_t *env)
+{
+    axis2_woden_interface_fault_impl_t *interface_fault_impl = NULL;
+   
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    if(!interface_fault)
+    {
+        interface_fault_impl = (axis2_woden_interface_fault_impl_t *) create(env);
+    }
+    else
+        interface_fault_impl = (axis2_woden_interface_fault_impl_t *) interface_fault;
+
+    axis2_woden_interface_fault_free_ops(interface_fault, env);
+
+    interface_fault_impl->interface_fault.base.interface_fault_element.base.nested_element.ops = 
+        AXIS2_MALLOC(env->allocator, 
+                sizeof(axis2_woden_nested_element_ops_t));
+    axis2_woden_interface_fault_element_resolve_methods(&(interface_fault_impl->interface_fault.base.
+            interface_fault_element.base.nested_element), env, interface_fault_impl->methods);
+    return interface_fault;
+}
+
+
 /************************End of Woden C Internal Methods***********************/
 static axis2_woden_interface_fault_t *
 create(const axis2_env_t *env)
@@ -232,6 +258,8 @@
     interface_fault_impl->interface_fault.base.nested_configurable.ops = NULL;
     interface_fault_impl->interface_fault.base.nested_configurable.base.configurable.ops = 
             NULL;
+    interface_fault_impl->interface_fault.base.interface_fault_element.base.
+        nested_element.ops = NULL;
     
     interface_fault_impl->interface_fault.ops = AXIS2_MALLOC(env->allocator, 
             sizeof(axis2_woden_interface_fault_ops_t));
@@ -246,6 +274,10 @@
         axis2_woden_interface_fault_get_element_declaration;
     interface_fault_impl->interface_fault.ops->to_element = 
         axis2_woden_interface_fault_to_element;
+    interface_fault_impl->interface_fault.ops->set_element_declaration = 
+        axis2_woden_interface_fault_set_element_declaration;
+    interface_fault_impl->interface_fault.ops->set_types = 
+        axis2_woden_interface_fault_set_types;
  
     interface_fault_impl->methods = axis2_hash_make(env);
     if(!interface_fault_impl->methods) 
@@ -347,13 +379,24 @@
             NULL;
     }
     
-    if(interface_fault_impl->interface_fault.base.nested_configurable.base.configurable.ops)
+    if(interface_fault_impl->interface_fault.base.nested_configurable.base.
+            configurable.ops)
     {
         AXIS2_FREE(env->allocator, interface_fault_impl->interface_fault.base.
                 nested_configurable.base.configurable.ops);
-        interface_fault_impl->interface_fault.base.nested_configurable.base.configurable.ops = 
+        interface_fault_impl->interface_fault.base.nested_configurable.base.
+            configurable.ops = 
             NULL;
     }
+
+    if(interface_fault_impl->interface_fault.base.interface_fault_element.base.
+            nested_element.ops)
+    {
+        AXIS2_FREE(env->allocator, interface_fault_impl->interface_fault.base.
+                interface_fault_element.base.nested_element.ops);
+        interface_fault_impl->interface_fault.base.interface_fault_element.base.
+            nested_element.ops = NULL;
+    }
     
     return AXIS2_SUCCESS;
 }
@@ -499,6 +542,18 @@
     if(!interface_fault->ops->to_element && interface_fault_impl_l)
             interface_fault->ops->to_element = 
             interface_fault_impl_l->interface_fault.ops->to_element;
+    
+    interface_fault->ops->set_element_declaration = axis2_hash_get(methods, 
+            "set_element_declaration", AXIS2_HASH_KEY_STRING);
+    if(!interface_fault->ops->set_element_declaration && interface_fault_impl_l)
+            interface_fault->ops->set_element_declaration = 
+            interface_fault_impl_l->interface_fault.ops->set_element_declaration;
+    
+    interface_fault->ops->set_types = axis2_hash_get(methods, 
+            "set_types", AXIS2_HASH_KEY_STRING);
+    if(!interface_fault->ops->set_types && interface_fault_impl_l)
+            interface_fault->ops->set_types = 
+            interface_fault_impl_l->interface_fault.ops->set_types;
    
     return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/desc_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/desc_element.c?rev=412096&r1=412095&r2=412096&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/desc_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/desc_element.c Tue Jun  6 04:33:08 2006
@@ -106,10 +106,10 @@
             "add_svc_element", AXIS2_HASH_KEY_STRING);
     desc_element->ops->get_svc_elements = axis2_hash_get(methods,
             "get_svc_elements", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->set_extension_registry = axis2_hash_get(methods,
-            "set_extension_registry", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->get_extension_registry = axis2_hash_get(methods,
-            "get_extension_registry", AXIS2_HASH_KEY_STRING);
+    desc_element->ops->set_ext_registry = axis2_hash_get(methods,
+            "set_ext_registry", AXIS2_HASH_KEY_STRING);
+    desc_element->ops->get_ext_registry = axis2_hash_get(methods,
+            "get_ext_registry", AXIS2_HASH_KEY_STRING);
     desc_element->ops->to_component = axis2_hash_get(methods,
             "to_component", AXIS2_HASH_KEY_STRING);
 



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


Mime
View raw message