You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2006/06/14 07:23:21 UTC

svn commit: r414079 [13/26] - in /webservices/axis2/trunk/c/woden: include/ src/builder/ src/schema/ src/util/ src/wsdl20/ src/wsdl20/enumeration/ src/wsdl20/extensions/ src/wsdl20/extensions/soap/ src/wsdl20/xml/ src/xml/ test/

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=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/desc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/desc.c Tue Jun 13 22:23:14 2006
@@ -14,45 +14,45 @@
  * limitations under the License.
  */
 
-#include <woden/axis2_woden_wsdl_obj.h>
-#include <woden/wsdl20/axis2_woden_desc.h>
-#include <woden/wsdl20/axis2_woden_element_decl.h>
-#include <woden/wsdl20/axis2_woden_type_def.h>
-#include <woden/wsdl20/axis2_woden_documentation.h>
-#include <woden/wsdl20/axis2_woden_import.h>
-#include <woden/wsdl20/axis2_woden_include.h>
-#include <woden/wsdl20/axis2_woden_types.h>
-#include <woden/wsdl20/axis2_woden_interface.h>
-#include <woden/wsdl20/axis2_woden_interface_fault.h>
-#include <woden/wsdl20/axis2_woden_interface_op.h>
-#include <woden/wsdl20/axis2_woden_interface_fault_ref.h>
-#include <woden/wsdl20/axis2_woden_interface_msg_ref.h>
-#include <woden/wsdl20/axis2_woden_binding.h>
-#include <woden/wsdl20/axis2_woden_binding_fault.h>
-#include <woden/wsdl20/axis2_woden_binding_op.h>
-#include <woden/wsdl20/axis2_woden_binding_fault_ref.h>
-#include <woden/wsdl20/axis2_woden_binding_msg_ref.h>
-#include <woden/wsdl20/axis2_woden_svc.h>
-#include <woden/wsdl20/axis2_woden_endpoint.h>
-#include <woden/wsdl20/axis2_woden_feature.h>
-#include <woden/wsdl20/axis2_woden_property.h>
-
-#include <woden/wsdl20/extensions/axis2_woden_ext_element.h>
-#include <woden/wsdl20/extensions/axis2_woden_component_exts.h>
-#include <woden/xml/axis2_woden_xml_attr.h>
-#include <woden/wsdl20/xml/axis2_woden_documentation_element.h>
+#include <woden/woden_wsdl_obj.h>
+#include <woden_desc.h>
+#include <woden_element_decl.h>
+#include <woden_type_def.h>
+#include <woden_documentation.h>
+#include <woden_import.h>
+#include <woden_include.h>
+#include <woden_types.h>
+#include <woden_interface.h>
+#include <woden_interface_fault.h>
+#include <woden_interface_op.h>
+#include <woden_interface_fault_ref.h>
+#include <woden_interface_msg_ref.h>
+#include <woden_binding.h>
+#include <woden_binding_fault.h>
+#include <woden_binding_op.h>
+#include <woden_binding_fault_ref.h>
+#include <woden_binding_msg_ref.h>
+#include <woden_svc.h>
+#include <woden_endpoint.h>
+#include <woden_feature.h>
+#include <woden_property.h>
+
+#include <woden_ext_element.h>
+#include <woden_component_exts.h>
+#include <woden_xml_attr.h>
+#include <woden_documentation_element.h>
 
-typedef struct axis2_woden_desc_impl axis2_woden_desc_impl_t;
+typedef struct woden_desc_impl woden_desc_impl_t;
 
 /** 
  * @brief Description Struct Impl
  *   Axis2 Description  
  */ 
-struct axis2_woden_desc_impl
+struct woden_desc_impl
 {
-    axis2_woden_desc_t desc;
-    axis2_woden_obj_types_t obj_type;
-    axis2_woden_documentable_t *documentable;
+    woden_desc_t desc;
+    woden_obj_types_t obj_type;
+    woden_documentable_t *documentable;
     axis2_hash_t *super;
     axis2_hash_t *methods;
 
@@ -79,30 +79,30 @@
 
 };
 
-#define INTF_TO_IMPL(desc) ((axis2_woden_desc_impl_t *) desc)
+#define INTF_TO_IMPL(desc) ((woden_desc_impl_t *) desc)
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_desc_free(
+woden_desc_free(
         void *desc,
         const axis2_env_t *env);
 
 static axis2_status_t AXIS2_CALL
-axis2_woden_desc_free_ops(
+woden_desc_free_ops(
         void *desc,
         const axis2_env_t *env);
 
 axis2_hash_t *AXIS2_CALL 
-axis2_woden_desc_super_objs(
+woden_desc_super_objs(
         void *desc,
         const axis2_env_t *env);
 
-axis2_woden_obj_types_t AXIS2_CALL 
-axis2_woden_desc_type(
+woden_obj_types_t AXIS2_CALL 
+woden_desc_type(
         void *desc,
         const axis2_env_t *env);
 
-axis2_woden_documentable_t *AXIS2_CALL
-axis2_woden_desc_get_base_impl(
+woden_documentable_t *AXIS2_CALL
+woden_desc_get_base_impl(
         void *desc,
         const axis2_env_t *env);
 
@@ -110,44 +110,44 @@
  *  Description interface methods (the WSDL Component model)
  * ************************************************************/
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_interfaces(
+woden_desc_get_interfaces(
         void *desc,
         const axis2_env_t *env);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_bindings(
+woden_desc_get_bindings(
         void *desc,
         const axis2_env_t *env);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_svcs(
+woden_desc_get_svcs(
         void *desc,
         const axis2_env_t *env);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_element_decls(
+woden_desc_get_element_decls(
         void *desc,
         const axis2_env_t *env);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_element_decl(
+woden_desc_get_element_decl(
         void *desc,
         const axis2_env_t *env,
         axis2_qname_t *qname);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_type_defs(
+woden_desc_get_type_defs(
         void *desc,
         const axis2_env_t *env);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_type_def(
+woden_desc_get_type_def(
         void *desc,
         const axis2_env_t *env,
         axis2_qname_t *qname);
 
 void *AXIS2_CALL
-axis2_woden_desc_to_element(
+woden_desc_to_element(
         void *desc,
         const axis2_env_t *env);
 
@@ -156,204 +156,204 @@
  * ************************************************************/
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_set_document_base_uri(
+woden_desc_set_document_base_uri(
         void *desc,
         const axis2_env_t *env,
         axis2_uri_t *doc_base_uri);
 
 axis2_uri_t *AXIS2_CALL
-axis2_woden_desc_get_document_base_uri(
+woden_desc_get_document_base_uri(
         void *desc,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_set_target_namespace(
+woden_desc_set_target_namespace(
         void *desc,
         const axis2_env_t *env,
         axis2_uri_t *namespc);
 
 axis2_uri_t *AXIS2_CALL
-axis2_woden_desc_get_target_namespace(
+woden_desc_get_target_namespace(
         void *desc,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_namespace(
+woden_desc_add_namespace(
         void *desc,
         const axis2_env_t *env,
         axis2_char_t *prefix,
         axis2_uri_t *namespc);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_remove_namespace(
+woden_desc_remove_namespace(
         void *desc,
         const axis2_env_t *env,
         axis2_char_t *prefix);
 
 axis2_uri_t *AXIS2_CALL
-axis2_woden_desc_get_namespace(
+woden_desc_get_namespace(
         void *desc,
         const axis2_env_t *env,
         axis2_char_t *prefix);
 
 axis2_hash_t *AXIS2_CALL
-axis2_woden_desc_get_namespaces(
+woden_desc_get_namespaces(
         void *desc,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_import_element(
+woden_desc_add_import_element(
         void *desc,
         const axis2_env_t *env,
         void *import_el);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_import_elements(
+woden_desc_get_import_elements(
         void *desc,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_include_element(
+woden_desc_add_include_element(
         void *desc,
         const axis2_env_t *env,
         void *include_el);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_include_elements(
+woden_desc_get_include_elements(
         void *desc,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_set_types_element(
+woden_desc_set_types_element(
         void *desc,
         const axis2_env_t *env,
         void *types_el);
 
 axis2_uri_t *AXIS2_CALL
-axis2_woden_desc_get_types_element(
+woden_desc_get_types_element(
         void *desc,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_interface_element(
+woden_desc_add_interface_element(
         void *desc,
         const axis2_env_t *env,
         void *interface_el);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_interface_elements(
+woden_desc_get_interface_elements(
         void *desc,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_binding_element(
+woden_desc_add_binding_element(
         void *desc,
         const axis2_env_t *env,
         void *binding_el);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_binding_elements(
+woden_desc_get_binding_elements(
         void *desc,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_svc_element(
+woden_desc_add_svc_element(
         void *desc,
         const axis2_env_t *env,
         void *svc_el);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_svc_elements(
+woden_desc_get_svc_elements(
         void *desc,
         const axis2_env_t *env);
 
 /* Creator methods */
 
 void *AXIS2_CALL
-axis2_woden_desc_create_documentation_element(
+woden_desc_create_documentation_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_import_element(
+woden_desc_create_import_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_include_element(
+woden_desc_create_include_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_types_element(
+woden_desc_create_types_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_interface_element(
+woden_desc_create_interface_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_interface_fault_element(
+woden_desc_create_interface_fault_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_interface_op_element(
+woden_desc_create_interface_op_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_interface_fault_ref_element(
+woden_desc_create_interface_fault_ref_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_interface_msg_ref_element(
+woden_desc_create_interface_msg_ref_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_binding_element(
+woden_desc_create_binding_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_binding_fault_element(
+woden_desc_create_binding_fault_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_binding_op_element(
+woden_desc_create_binding_op_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_binding_fault_ref_element(
+woden_desc_create_binding_fault_ref_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_binding_msg_ref_element(
+woden_desc_create_binding_msg_ref_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_svc_element(
+woden_desc_create_svc_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_endpoint_element(
+woden_desc_create_endpoint_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_feature_element(
+woden_desc_create_feature_element(
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_create_property_element(
+woden_desc_create_property_element(
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_set_ext_registry(
+woden_desc_set_ext_registry(
         void *desc,
         const axis2_env_t *env,
         void *ext_reg);
 
 void *AXIS2_CALL
-axis2_woden_desc_get_ext_registry(
+woden_desc_get_ext_registry(
         void *desc,
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_desc_to_component(
+woden_desc_to_component(
         void *desc,
         const axis2_env_t *env);
 /* ************************************************************
@@ -371,218 +371,218 @@
  */
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_to_all_interfaces(
+woden_desc_add_to_all_interfaces(
         void *desc,
         const axis2_env_t *env,
         void *interface);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_to_all_bindings(
+woden_desc_add_to_all_bindings(
         void *desc,
         const axis2_env_t *env,
         void *binding);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_to_all_svcs(
+woden_desc_add_to_all_svcs(
         void *desc,
         const axis2_env_t *env,
         void *svc);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_to_all_element_decls(
+woden_desc_add_to_all_element_decls(
         void *desc,
         const axis2_env_t *env,
         void *element_decl);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_to_all_type_defs(
+woden_desc_add_to_all_type_defs(
         void *desc,
         const axis2_env_t *env,
         void *type_def);
 
 static axis2_status_t AXIS2_CALL
-axis2_woden_desc_init_components(
+woden_desc_init_components(
         void *desc,
         const axis2_env_t *env);
 
-static axis2_woden_desc_t *
+static woden_desc_t *
 create(const axis2_env_t *env);
 
 /************************Woden C Internal Methods******************************/
-AXIS2_EXTERN axis2_woden_desc_t * AXIS2_CALL
-axis2_woden_desc_to_desc_element(
+AXIS2_EXTERN woden_desc_t * AXIS2_CALL
+woden_desc_to_desc_element(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
    
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if(!desc)
     {
-        desc_impl = (axis2_woden_desc_impl_t *) create(env);
+        desc_impl = (woden_desc_impl_t *) create(env);
     }
     else
-        desc_impl = (axis2_woden_desc_impl_t *) desc;
+        desc_impl = (woden_desc_impl_t *) desc;
 
-    axis2_woden_desc_free_ops(desc, env);
+    woden_desc_free_ops(desc, env);
     desc_impl->desc.base.desc_element.ops = 
         AXIS2_MALLOC(env->allocator, 
-                sizeof(axis2_woden_desc_element_ops_t));
-    axis2_woden_desc_element_resolve_methods(&(desc_impl->desc.base.
+                sizeof(woden_desc_element_ops_t));
+    woden_desc_element_resolve_methods(&(desc_impl->desc.base.
             desc_element), env, desc_impl->methods);
     return desc;
 }
 
-AXIS2_EXTERN axis2_woden_desc_t * AXIS2_CALL
-axis2_woden_desc_to_documentable_element(
+AXIS2_EXTERN woden_desc_t * AXIS2_CALL
+woden_desc_to_documentable_element(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
    
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if(!desc)
     {
-        desc_impl = (axis2_woden_desc_impl_t *) create(env);
+        desc_impl = (woden_desc_impl_t *) create(env);
     }
     else
-        desc_impl = (axis2_woden_desc_impl_t *) desc;
+        desc_impl = (woden_desc_impl_t *) desc;
 
-    axis2_woden_desc_free_ops(desc, env);
+    woden_desc_free_ops(desc, env);
     desc_impl->desc.base.desc_element.documentable_element.ops = 
         AXIS2_MALLOC(env->allocator, 
-                sizeof(axis2_woden_documentable_element_ops_t));
-    axis2_woden_documentable_element_resolve_methods(&(desc_impl->desc.base.
+                sizeof(woden_documentable_element_ops_t));
+    woden_documentable_element_resolve_methods(&(desc_impl->desc.base.
             desc_element.documentable_element), env, 
             desc_impl->methods);
     return desc;
 }
 
-AXIS2_EXTERN axis2_woden_desc_t * AXIS2_CALL
-axis2_woden_desc_to_documentable(
+AXIS2_EXTERN woden_desc_t * AXIS2_CALL
+woden_desc_to_documentable(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
    
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if(!desc)
     {
-        desc_impl = (axis2_woden_desc_impl_t *) create(env);
+        desc_impl = (woden_desc_impl_t *) create(env);
     }
     else
-        desc_impl = (axis2_woden_desc_impl_t *) desc;
+        desc_impl = (woden_desc_impl_t *) desc;
 
-    axis2_woden_desc_free_ops(desc, env);
+    woden_desc_free_ops(desc, env);
     desc_impl->desc.base.documentable.ops = 
         AXIS2_MALLOC(env->allocator, 
-                sizeof(axis2_woden_documentable_ops_t));
-    axis2_woden_documentable_resolve_methods(&(desc_impl->desc.base.
+                sizeof(woden_documentable_ops_t));
+    woden_documentable_resolve_methods(&(desc_impl->desc.base.
             documentable), env, desc_impl->documentable, 
             desc_impl->methods);
     return desc;
 }
 
-AXIS2_EXTERN axis2_woden_desc_t * AXIS2_CALL
-axis2_woden_desc_to_wsdl_obj(
+AXIS2_EXTERN woden_desc_t * AXIS2_CALL
+woden_desc_to_wsdl_obj(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     void *wsdl_obj = NULL;
    
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if(!desc)
     {
-        desc_impl = (axis2_woden_desc_impl_t *) create(env);
+        desc_impl = (woden_desc_impl_t *) create(env);
     }
     else
-        desc_impl = (axis2_woden_desc_impl_t *) desc;
+        desc_impl = (woden_desc_impl_t *) desc;
 
-    axis2_woden_desc_free_ops(desc, env);
+    woden_desc_free_ops(desc, env);
     desc_impl->desc.base.documentable.base.wsdl_obj.ops = 
         AXIS2_MALLOC(env->allocator, 
-                sizeof(axis2_woden_wsdl_obj_ops_t));
-    wsdl_obj = AXIS2_WODEN_DOCUMENTABLE_GET_BASE_IMPL(
+                sizeof(woden_wsdl_obj_ops_t));
+    wsdl_obj = WODEN_DOCUMENTABLE_GET_BASE_IMPL(
             desc_impl->documentable, env);
-    axis2_woden_wsdl_obj_resolve_methods(&(desc_impl->desc.base.
+    woden_wsdl_obj_resolve_methods(&(desc_impl->desc.base.
             documentable.base.wsdl_obj), env, wsdl_obj, desc_impl->methods);
     return desc;
 }
 
-AXIS2_EXTERN axis2_woden_desc_t * AXIS2_CALL
-axis2_woden_desc_to_wsdl_component(
+AXIS2_EXTERN woden_desc_t * AXIS2_CALL
+woden_desc_to_wsdl_component(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     if(!desc)
     {
-        desc_impl = (axis2_woden_desc_impl_t *) create(env);
+        desc_impl = (woden_desc_impl_t *) create(env);
     }
     else
-        desc_impl = (axis2_woden_desc_impl_t *) desc;
-    axis2_woden_desc_free_ops(desc, env);
+        desc_impl = (woden_desc_impl_t *) desc;
+    woden_desc_free_ops(desc, env);
     desc_impl->desc.base.wsdl_component.ops = 
         AXIS2_MALLOC(env->allocator, 
-        sizeof(axis2_woden_wsdl_component_ops_t));
-    axis2_woden_wsdl_component_resolve_methods(&(desc_impl->desc.base.
+        sizeof(woden_wsdl_component_ops_t));
+    woden_wsdl_component_resolve_methods(&(desc_impl->desc.base.
                 wsdl_component), env, desc_impl->methods);
     return desc;
 }
 
-AXIS2_EXTERN axis2_woden_desc_t * AXIS2_CALL
-axis2_woden_desc_to_attr_extensible(
+AXIS2_EXTERN woden_desc_t * AXIS2_CALL
+woden_desc_to_attr_extensible(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
    
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if(!desc)
     {
-        desc_impl = (axis2_woden_desc_impl_t *) create(env);
+        desc_impl = (woden_desc_impl_t *) create(env);
     }
     else
-        desc_impl = (axis2_woden_desc_impl_t *) desc;
+        desc_impl = (woden_desc_impl_t *) desc;
 
-    axis2_woden_desc_free_ops(desc, env);
+    woden_desc_free_ops(desc, env);
 
     desc_impl->desc.base.desc_element.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(&(desc_impl->desc.base.
+                sizeof(woden_attr_extensible_ops_t));
+    woden_attr_extensible_resolve_methods(&(desc_impl->desc.base.
             desc_element.documentable_element.wsdl_element.base.
             attr_extensible), env, NULL, desc_impl->methods);
     return desc;
 }
 
-AXIS2_EXTERN axis2_woden_desc_t * AXIS2_CALL
-axis2_woden_desc_to_element_extensible(
+AXIS2_EXTERN woden_desc_t * AXIS2_CALL
+woden_desc_to_element_extensible(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
    
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if(!desc)
     {
-        desc_impl = (axis2_woden_desc_impl_t *) create(env);
+        desc_impl = (woden_desc_impl_t *) create(env);
     }
     else
-        desc_impl = (axis2_woden_desc_impl_t *) desc;
+        desc_impl = (woden_desc_impl_t *) desc;
 
-    axis2_woden_desc_free_ops(desc, env);
+    woden_desc_free_ops(desc, env);
 
     desc_impl->desc.base.desc_element.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(&(desc_impl->desc.base.
+                sizeof(woden_element_extensible_ops_t));
+    woden_element_extensible_resolve_methods(&(desc_impl->desc.base.
             desc_element.documentable_element.wsdl_element.base.
             element_extensible), env, NULL, desc_impl->methods);
     return desc;
@@ -590,16 +590,16 @@
 
 
 /************************End of Woden C Internal Methods***********************/
-static axis2_woden_desc_t *
+static woden_desc_t *
 create(const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
    
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     desc_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_woden_desc_impl_t));
+                    sizeof(woden_desc_impl_t));
 
-    desc_impl->obj_type= AXIS2_WODEN_DESC;
+    desc_impl->obj_type= WODEN_DESC;
     desc_impl->super = NULL;
     desc_impl->methods = NULL;
     
@@ -632,21 +632,21 @@
             base.element_extensible.ops = NULL;
     
     desc_impl->desc.ops = AXIS2_MALLOC(env->allocator, 
-            sizeof(axis2_woden_desc_ops_t));
+            sizeof(woden_desc_ops_t));
 
-    desc_impl->desc.ops->free = axis2_woden_desc_free;
-    desc_impl->desc.ops->super_objs = axis2_woden_desc_super_objs;
-    desc_impl->desc.ops->type = axis2_woden_desc_type;
-    desc_impl->desc.ops->get_base_impl = axis2_woden_desc_get_base_impl;
-    
-    desc_impl->desc.ops->get_interfaces = axis2_woden_desc_get_interfaces;
-    desc_impl->desc.ops->get_bindings = axis2_woden_desc_get_bindings;
-    desc_impl->desc.ops->get_svcs = axis2_woden_desc_get_svcs;
-    desc_impl->desc.ops->get_element_decls = axis2_woden_desc_get_element_decls;
-    desc_impl->desc.ops->get_element_decl = axis2_woden_desc_get_element_decl;
-    desc_impl->desc.ops->get_type_defs = axis2_woden_desc_get_type_defs;
-    desc_impl->desc.ops->get_type_def = axis2_woden_desc_get_type_def;
-    desc_impl->desc.ops->to_element = axis2_woden_desc_to_element;
+    desc_impl->desc.ops->free = woden_desc_free;
+    desc_impl->desc.ops->super_objs = woden_desc_super_objs;
+    desc_impl->desc.ops->type = woden_desc_type;
+    desc_impl->desc.ops->get_base_impl = woden_desc_get_base_impl;
+    
+    desc_impl->desc.ops->get_interfaces = woden_desc_get_interfaces;
+    desc_impl->desc.ops->get_bindings = woden_desc_get_bindings;
+    desc_impl->desc.ops->get_svcs = woden_desc_get_svcs;
+    desc_impl->desc.ops->get_element_decls = woden_desc_get_element_decls;
+    desc_impl->desc.ops->get_element_decl = woden_desc_get_element_decl;
+    desc_impl->desc.ops->get_type_defs = woden_desc_get_type_defs;
+    desc_impl->desc.ops->get_type_def = woden_desc_get_type_def;
+    desc_impl->desc.ops->to_element = woden_desc_to_element;
  
     desc_impl->methods = axis2_hash_make(env);
     if(!desc_impl->methods) 
@@ -655,187 +655,187 @@
         return NULL;
     }
     axis2_hash_set(desc_impl->methods, "free", AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_free);
+            woden_desc_free);
     axis2_hash_set(desc_impl->methods, "super_objs", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_desc_super_objs);
+            AXIS2_HASH_KEY_STRING, woden_desc_super_objs);
     axis2_hash_set(desc_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_desc_type);
+            AXIS2_HASH_KEY_STRING, woden_desc_type);
 
     axis2_hash_set(desc_impl->methods, "get_interfaces", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_interfaces);
+            woden_desc_get_interfaces);
     axis2_hash_set(desc_impl->methods, "get_bindings", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_bindings);
+            woden_desc_get_bindings);
     axis2_hash_set(desc_impl->methods, "get_svcs", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_svcs);
+            woden_desc_get_svcs);
     axis2_hash_set(desc_impl->methods, "get_element_decls", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_element_decls);
+            woden_desc_get_element_decls);
     axis2_hash_set(desc_impl->methods, "get_element_decl", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_element_decl);
+            woden_desc_get_element_decl);
     axis2_hash_set(desc_impl->methods, "get_type_defs", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_type_defs);
+            woden_desc_get_type_defs);
     axis2_hash_set(desc_impl->methods, "get_type_def", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_type_def);
+            woden_desc_get_type_def);
     axis2_hash_set(desc_impl->methods, "to_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_to_element);
+            woden_desc_to_element);
     axis2_hash_set(desc_impl->methods, "set_document_base_uri", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_set_document_base_uri);
+            woden_desc_set_document_base_uri);
     axis2_hash_set(desc_impl->methods, "get_document_base_uri", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_document_base_uri);
+            woden_desc_get_document_base_uri);
     axis2_hash_set(desc_impl->methods, "set_target_namespace", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_set_target_namespace);
+            woden_desc_set_target_namespace);
     axis2_hash_set(desc_impl->methods, "get_target_namespace", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_target_namespace);
+            woden_desc_get_target_namespace);
     axis2_hash_set(desc_impl->methods, "add_namespace", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_add_namespace);
+            woden_desc_add_namespace);
     axis2_hash_set(desc_impl->methods, "remove_namespace", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_remove_namespace);
+            woden_desc_remove_namespace);
     axis2_hash_set(desc_impl->methods, "get_namespace", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_namespace);
+            woden_desc_get_namespace);
     axis2_hash_set(desc_impl->methods, "get_namespaces", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_namespaces);
+            woden_desc_get_namespaces);
     axis2_hash_set(desc_impl->methods, "add_import_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_add_import_element);
+            woden_desc_add_import_element);
     axis2_hash_set(desc_impl->methods, "get_import_elements", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_import_elements);
+            woden_desc_get_import_elements);
     axis2_hash_set(desc_impl->methods, "add_include_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_add_include_element);
+            woden_desc_add_include_element);
     axis2_hash_set(desc_impl->methods, "get_include_elements", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_include_elements);
+            woden_desc_get_include_elements);
     axis2_hash_set(desc_impl->methods, "set_types_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_set_types_element);
+            woden_desc_set_types_element);
     axis2_hash_set(desc_impl->methods, "get_types_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_types_element);
+            woden_desc_get_types_element);
     axis2_hash_set(desc_impl->methods, "add_interface_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_add_interface_element);
+            woden_desc_add_interface_element);
     axis2_hash_set(desc_impl->methods, "get_interface_elements", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_interface_elements);
+            woden_desc_get_interface_elements);
     axis2_hash_set(desc_impl->methods, "add_binding_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_add_binding_element);
+            woden_desc_add_binding_element);
     axis2_hash_set(desc_impl->methods, "get_binding_elements", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_binding_elements);
+            woden_desc_get_binding_elements);
     axis2_hash_set(desc_impl->methods, "add_svc_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_add_svc_element);
+            woden_desc_add_svc_element);
     axis2_hash_set(desc_impl->methods, "get_svc_elements", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_svc_elements);
+            woden_desc_get_svc_elements);
     axis2_hash_set(desc_impl->methods, "create_documentation_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_documentation_element);
+            woden_desc_create_documentation_element);
     axis2_hash_set(desc_impl->methods, "create_import_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_import_element);
+            woden_desc_create_import_element);
     axis2_hash_set(desc_impl->methods, "create_include_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_include_element);
+            woden_desc_create_include_element);
     axis2_hash_set(desc_impl->methods, "create_types_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_types_element);
+            woden_desc_create_types_element);
     axis2_hash_set(desc_impl->methods, "create_interface_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_interface_element);
+            woden_desc_create_interface_element);
     axis2_hash_set(desc_impl->methods, "create_interface_fault_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_interface_fault_element);
+            woden_desc_create_interface_fault_element);
     axis2_hash_set(desc_impl->methods, "create_interface_op_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_interface_op_element);
+            woden_desc_create_interface_op_element);
     axis2_hash_set(desc_impl->methods, "create_interface_fault_ref_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_interface_fault_ref_element);
+            woden_desc_create_interface_fault_ref_element);
     axis2_hash_set(desc_impl->methods, "create_interface_msg_ref_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_interface_msg_ref_element);
+            woden_desc_create_interface_msg_ref_element);
     axis2_hash_set(desc_impl->methods, "create_binding_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_binding_element);
+            woden_desc_create_binding_element);
     axis2_hash_set(desc_impl->methods, "create_binding_fault_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_binding_fault_element);
+            woden_desc_create_binding_fault_element);
     axis2_hash_set(desc_impl->methods, "create_binding_op_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_binding_op_element);
+            woden_desc_create_binding_op_element);
     axis2_hash_set(desc_impl->methods, "create_binding_fault_ref_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_binding_fault_ref_element);
+            woden_desc_create_binding_fault_ref_element);
     axis2_hash_set(desc_impl->methods, "create_binding_msg_ref_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_binding_msg_ref_element);
+            woden_desc_create_binding_msg_ref_element);
     axis2_hash_set(desc_impl->methods, "create_svc_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_svc_element);
+            woden_desc_create_svc_element);
     axis2_hash_set(desc_impl->methods, "create_endpoint_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_endpoint_element);
+            woden_desc_create_endpoint_element);
     axis2_hash_set(desc_impl->methods, "create_feature_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_feature_element);
+            woden_desc_create_feature_element);
     axis2_hash_set(desc_impl->methods, "create_property_element", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_create_property_element);
+            woden_desc_create_property_element);
     axis2_hash_set(desc_impl->methods, "set_ext_registry", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_set_ext_registry);
+            woden_desc_set_ext_registry);
     axis2_hash_set(desc_impl->methods, "get_ext_registry", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_get_ext_registry);
+            woden_desc_get_ext_registry);
     axis2_hash_set(desc_impl->methods, "to_component", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_to_component);
+            woden_desc_to_component);
     axis2_hash_set(desc_impl->methods, "add_to_all_interfaces", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_add_to_all_interfaces);
+            woden_desc_add_to_all_interfaces);
     axis2_hash_set(desc_impl->methods, "add_to_all_bindings", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_add_to_all_bindings);
+            woden_desc_add_to_all_bindings);
     axis2_hash_set(desc_impl->methods, "add_to_all_svcs", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_add_to_all_svcs);
+            woden_desc_add_to_all_svcs);
     axis2_hash_set(desc_impl->methods, "add_to_all_element_decls", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_add_to_all_element_decls);
+            woden_desc_add_to_all_element_decls);
     axis2_hash_set(desc_impl->methods, "add_to_all_type_defs", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_desc_add_to_all_type_defs);
+            woden_desc_add_to_all_type_defs);
 
     return &(desc_impl->desc);
 }
 
-AXIS2_EXTERN axis2_woden_desc_t * AXIS2_CALL
-axis2_woden_desc_create(const axis2_env_t *env)
+AXIS2_EXTERN woden_desc_t * AXIS2_CALL
+woden_desc_create(const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
    
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    desc_impl = (axis2_woden_desc_impl_t *) create(env);
+    desc_impl = (woden_desc_impl_t *) create(env);
 
-    desc_impl->documentable = axis2_woden_documentable_create(env);
+    desc_impl->documentable = woden_documentable_create(env);
 
     desc_impl->super = axis2_hash_make(env);
     if(!desc_impl->super) 
@@ -843,20 +843,20 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(desc_impl->super, "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING, 
+    axis2_hash_set(desc_impl->super, "WODEN_DESC", AXIS2_HASH_KEY_STRING, 
             &(desc_impl->desc));
-    axis2_hash_set(desc_impl->super, "AXIS2_WODEN_DOCUMENTABLE", AXIS2_HASH_KEY_STRING, 
+    axis2_hash_set(desc_impl->super, "WODEN_DOCUMENTABLE", AXIS2_HASH_KEY_STRING, 
             desc_impl->documentable);
  
     return &(desc_impl->desc);
 }
 
 static axis2_status_t AXIS2_CALL
-axis2_woden_desc_free_ops(
+woden_desc_free_ops(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     desc_impl = INTF_TO_IMPL(desc);
@@ -924,11 +924,11 @@
 
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_free(
+woden_desc_free(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     desc_impl = INTF_TO_IMPL(desc);
@@ -949,11 +949,11 @@
 
     if(desc_impl->documentable)
     {
-        AXIS2_WODEN_DOCUMENTABLE_FREE(desc_impl->documentable, env);
+        WODEN_DOCUMENTABLE_FREE(desc_impl->documentable, env);
         desc_impl->documentable = NULL;
     }
 
-    axis2_woden_desc_free_ops(desc, env);
+    woden_desc_free_ops(desc, env);
 
     if((&(desc_impl->desc))->ops)
     {
@@ -970,11 +970,11 @@
 }
 
 axis2_hash_t *AXIS2_CALL
-axis2_woden_desc_super_objs(
+woden_desc_super_objs(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     desc_impl = INTF_TO_IMPL(desc);
@@ -982,12 +982,12 @@
     return desc_impl->super;
 }
 
-axis2_woden_obj_types_t AXIS2_CALL
-axis2_woden_desc_type(
+woden_obj_types_t AXIS2_CALL
+woden_desc_type(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     desc_impl = INTF_TO_IMPL(desc);
@@ -995,12 +995,12 @@
     return desc_impl->obj_type;
 }
 
-axis2_woden_documentable_t *AXIS2_CALL
-axis2_woden_desc_get_base_impl(
+woden_documentable_t *AXIS2_CALL
+woden_desc_get_base_impl(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     desc_impl = INTF_TO_IMPL(desc);
@@ -1009,13 +1009,13 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_resolve_methods(
-        axis2_woden_desc_t *desc,
+woden_desc_resolve_methods(
+        woden_desc_t *desc,
         const axis2_env_t *env,
-        axis2_woden_desc_t *desc_impl,
+        woden_desc_t *desc_impl,
         axis2_hash_t *methods)
 {
-    axis2_woden_desc_impl_t *desc_impl_l = NULL;
+    woden_desc_impl_t *desc_impl_l = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
@@ -1113,102 +1113,102 @@
  *  Description interface methods (the WSDL Component model)
  * ************************************************************/
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_interfaces(
+woden_desc_get_interfaces(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
    
     if(AXIS2_TRUE != desc_impl->f_component_initialized)
-        axis2_woden_desc_init_components(desc, env);
+        woden_desc_init_components(desc, env);
     return desc_impl->f_interface_elements;
 }
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_bindings(
+woden_desc_get_bindings(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
    
     if(AXIS2_TRUE != desc_impl->f_component_initialized)
-        axis2_woden_desc_init_components(desc, env);
+        woden_desc_init_components(desc, env);
     return desc_impl->f_binding_elements;
 }
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_svcs(
+woden_desc_get_svcs(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
    
     if(AXIS2_TRUE != desc_impl->f_component_initialized)
-        axis2_woden_desc_init_components(desc, env);
+        woden_desc_init_components(desc, env);
     return desc_impl->f_svc_elements;
 }
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_element_decls(
+woden_desc_get_element_decls(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
    
     if(AXIS2_TRUE != desc_impl->f_component_initialized)
-        axis2_woden_desc_init_components(desc, env);
+        woden_desc_init_components(desc, env);
     return desc_impl->f_all_element_decls;
 }
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_element_decl(
+woden_desc_get_element_decl(
         void *desc,
         const axis2_env_t *env,
         axis2_qname_t *qname)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
     void *el_decl = NULL;
     int i = 0, size = 0;
 
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, qname, NULL);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
    
     if(AXIS2_TRUE != desc_impl->f_component_initialized)
-        axis2_woden_desc_init_components(desc, env);
+        woden_desc_init_components(desc, env);
     size = AXIS2_ARRAY_LIST_SIZE(desc_impl->f_all_element_decls, env);
     for(i = 0; i < size; i++)
     {
         axis2_qname_t *qname_l = NULL;
         void *ed = AXIS2_ARRAY_LIST_GET(desc_impl->f_all_element_decls, env, i);
-        qname_l = AXIS2_WODEN_ELEMENT_DECL_GET_QNAME(ed, env);
+        qname_l = WODEN_ELEMENT_DECL_GET_QNAME(ed, env);
         if(0 == AXIS2_QNAME_EQUALS(qname, env, qname_l))
         {
             el_decl = ed;
@@ -1219,48 +1219,48 @@
 }
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_type_defs(
+woden_desc_get_type_defs(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
    
     if(AXIS2_TRUE != desc_impl->f_component_initialized)
-        axis2_woden_desc_init_components(desc, env);
+        woden_desc_init_components(desc, env);
     return desc_impl->f_all_type_defs;
 }
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_type_def(
+woden_desc_get_type_def(
         void *desc,
         const axis2_env_t *env,
         axis2_qname_t *qname)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
     void *type_def = NULL;
     int i = 0, size = 0;
 
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, qname, NULL);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
    
     if(AXIS2_TRUE != desc_impl->f_component_initialized)
-        axis2_woden_desc_init_components(desc, env);
+        woden_desc_init_components(desc, env);
     size = AXIS2_ARRAY_LIST_SIZE(desc_impl->f_all_element_decls, env);
     for(i = 0; i < size; i++)
     {
         axis2_qname_t *qname_l = NULL;
         void *ed = AXIS2_ARRAY_LIST_GET(desc_impl->f_all_element_decls, env, i);
-        qname_l = AXIS2_WODEN_TYPE_DEF_GET_QNAME(ed, env);
+        qname_l = WODEN_TYPE_DEF_GET_QNAME(ed, env);
         if(0 == AXIS2_QNAME_EQUALS(qname, env, qname_l))
         {
             type_def = ed;
@@ -1271,17 +1271,17 @@
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_to_element(
+woden_desc_to_element(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
    
     return &(desc_impl->desc);
 }
@@ -1291,19 +1291,19 @@
  * ************************************************************/
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_set_document_base_uri(
+woden_desc_set_document_base_uri(
         void *desc,
         const axis2_env_t *env,
         axis2_uri_t *doc_base_uri)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, doc_base_uri, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     if(desc_impl->f_doc_base_uri)
     {
         /* TODO */
@@ -1314,36 +1314,36 @@
 }
 
 axis2_uri_t *AXIS2_CALL
-axis2_woden_desc_get_document_base_uri(
+woden_desc_get_document_base_uri(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
    
     return desc_impl->f_doc_base_uri;
 }
 
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_set_target_namespace(
+woden_desc_set_target_namespace(
         void *desc,
         const axis2_env_t *env,
         axis2_uri_t *namespc)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     if(desc_impl->f_target_namespc)
     {
         /* TODO */
@@ -1354,36 +1354,36 @@
 }
 
 axis2_uri_t *AXIS2_CALL
-axis2_woden_desc_get_target_namespace(
+woden_desc_get_target_namespace(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
    
     return desc_impl->f_target_namespc;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_namespace(
+woden_desc_add_namespace(
         void *desc,
         const axis2_env_t *env,
         axis2_char_t *prefix,
         axis2_uri_t *namespc)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
     axis2_char_t *pfx = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     pfx = (NULL != prefix) ? prefix : "";
     if(NULL != namespc)
@@ -1395,19 +1395,19 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_remove_namespace(
+woden_desc_remove_namespace(
         void *desc,
         const axis2_env_t *env,
         axis2_char_t *prefix)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
     axis2_char_t *pfx = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     pfx = (NULL != prefix) ? prefix : "";
     axis2_hash_set(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING, NULL);
@@ -1415,122 +1415,122 @@
 }
 
 axis2_uri_t *AXIS2_CALL
-axis2_woden_desc_get_namespace(
+woden_desc_get_namespace(
         void *desc,
         const axis2_env_t *env,
         axis2_char_t *prefix)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
     axis2_char_t *pfx = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     pfx = (NULL != prefix) ? prefix : "";
     return axis2_hash_get(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING);
 }
 
 axis2_hash_t *AXIS2_CALL
-axis2_woden_desc_get_namespaces(
+woden_desc_get_namespaces(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     return desc_impl->f_namespcs;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_import_element(
+woden_desc_add_import_element(
         void *desc,
         const axis2_env_t *env,
         void *import_el)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, import_el, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     return AXIS2_ARRAY_LIST_ADD(desc_impl->f_import_elements, env, import_el);
 }
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_import_elements(
+woden_desc_get_import_elements(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     return desc_impl->f_import_elements;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_include_element(
+woden_desc_add_include_element(
         void *desc,
         const axis2_env_t *env,
         void *include_el)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, include_el, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     return AXIS2_ARRAY_LIST_ADD(desc_impl->f_include_elements, env, include_el);
 }
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_include_elements(
+woden_desc_get_include_elements(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     return desc_impl->f_include_elements;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_set_types_element(
+woden_desc_set_types_element(
         void *desc,
         const axis2_env_t *env,
         void *types_el)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, types_el, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     if(desc_impl->f_types_element)
     {
         /* TODO */
@@ -1541,119 +1541,119 @@
 }
 
 axis2_uri_t *AXIS2_CALL
-axis2_woden_desc_get_types_element(
+woden_desc_get_types_element(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
    
     return desc_impl->f_types_element;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_interface_element(
+woden_desc_add_interface_element(
         void *desc,
         const axis2_env_t *env,
         void *intface)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, intface, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     return AXIS2_ARRAY_LIST_ADD(desc_impl->f_interface_elements, env, intface);
 }
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_interface_elements(
+woden_desc_get_interface_elements(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     return desc_impl->f_interface_elements;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_binding_element(
+woden_desc_add_binding_element(
         void *desc,
         const axis2_env_t *env,
         void *binding)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, binding, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     return AXIS2_ARRAY_LIST_ADD(desc_impl->f_binding_elements, env, binding);
 }
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_binding_elements(
+woden_desc_get_binding_elements(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     return desc_impl->f_binding_elements;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_svc_element(
+woden_desc_add_svc_element(
         void *desc,
         const axis2_env_t *env,
         void *svc_el)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, svc_el, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     return AXIS2_ARRAY_LIST_ADD(desc_impl->f_svc_elements, env, svc_el);
 }
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_desc_get_svc_elements(
+woden_desc_get_svc_elements(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     return desc_impl->f_svc_elements;
 }
@@ -1661,145 +1661,145 @@
 /* Creator methods */
 
 void *AXIS2_CALL
-axis2_woden_desc_create_documentation_element(
+woden_desc_create_documentation_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_documentation_create(env);
+    return woden_documentation_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_import_element(
+woden_desc_create_import_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_import_create(env);
+    return woden_import_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_include_element(
+woden_desc_create_include_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_include_create(env);
+    return woden_include_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_types_element(
+woden_desc_create_types_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_types_create(env);
+    return woden_types_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_interface_element(
+woden_desc_create_interface_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_interface_create(env);
+    return woden_interface_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_interface_fault_element(
+woden_desc_create_interface_fault_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_interface_fault_create(env);
+    return woden_interface_fault_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_interface_op_element(
+woden_desc_create_interface_op_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_interface_op_create(env);
+    return woden_interface_op_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_interface_fault_ref_element(
+woden_desc_create_interface_fault_ref_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_interface_fault_ref_create(env);
+    return woden_interface_fault_ref_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_interface_msg_ref_element(
+woden_desc_create_interface_msg_ref_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_interface_msg_ref_create(env);
+    return woden_interface_msg_ref_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_binding_element(
+woden_desc_create_binding_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_binding_create(env);
+    return woden_binding_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_binding_fault_element(
+woden_desc_create_binding_fault_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_binding_fault_create(env);
+    return woden_binding_fault_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_binding_op_element(
+woden_desc_create_binding_op_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_binding_op_create(env);
+    return woden_binding_op_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_binding_fault_ref_element(
+woden_desc_create_binding_fault_ref_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_binding_fault_ref_create(env);
+    return woden_binding_fault_ref_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_binding_msg_ref_element(
+woden_desc_create_binding_msg_ref_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_binding_msg_ref_create(env);
+    return woden_binding_msg_ref_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_svc_element(
+woden_desc_create_svc_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_svc_create(env);
+    return woden_svc_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_endpoint_element(
+woden_desc_create_endpoint_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_endpoint_create(env);
+    return woden_endpoint_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_feature_element(
+woden_desc_create_feature_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_feature_create(env);
+    return woden_feature_create(env);
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_create_property_element(
+woden_desc_create_property_element(
         const axis2_env_t *env)
 {
-    return axis2_woden_property_create(env);
+    return woden_property_create(env);
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_set_ext_registry(
+woden_desc_set_ext_registry(
         void *desc,
         const axis2_env_t *env,
         void *ext_reg)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, ext_reg, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     if(desc_impl->f_ext_reg)
     {
         /* TODO */
@@ -1810,36 +1810,36 @@
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_get_ext_registry(
+woden_desc_get_ext_registry(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
    
     return desc_impl->f_ext_reg;
 }
 
 void *AXIS2_CALL
-axis2_woden_desc_to_component(
+woden_desc_to_component(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
    
     if(AXIS2_TRUE != desc_impl->f_component_initialized)
-        axis2_woden_desc_init_components(desc, env);
+        woden_desc_init_components(desc, env);
     return &(desc_impl->desc);
 }
 /* ************************************************************
@@ -1857,110 +1857,110 @@
  */
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_to_all_interfaces(
+woden_desc_add_to_all_interfaces(
         void *desc,
         const axis2_env_t *env,
         void *interface)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, interface, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     return AXIS2_ARRAY_LIST_ADD(desc_impl->f_all_interfaces, env, interface);
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_to_all_bindings(
+woden_desc_add_to_all_bindings(
         void *desc,
         const axis2_env_t *env,
         void *binding)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, binding, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     return AXIS2_ARRAY_LIST_ADD(desc_impl->f_all_bindings, env, binding);
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_to_all_svcs(
+woden_desc_add_to_all_svcs(
         void *desc,
         const axis2_env_t *env,
         void *svc)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, svc, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     return AXIS2_ARRAY_LIST_ADD(desc_impl->f_all_svcs, env, svc);
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_to_all_element_decls(
+woden_desc_add_to_all_element_decls(
         void *desc,
         const axis2_env_t *env,
         void *element_decl)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, element_decl, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     return AXIS2_ARRAY_LIST_ADD(desc_impl->f_all_element_decls, env, element_decl);
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_add_to_all_type_defs(
+woden_desc_add_to_all_type_defs(
         void *desc,
         const axis2_env_t *env,
         void *type_def)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, type_def, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     
     return AXIS2_ARRAY_LIST_ADD(desc_impl->f_all_type_defs, env, type_def);
 }
 
 static axis2_status_t AXIS2_CALL
-axis2_woden_desc_init_components(
+woden_desc_init_components(
         void *desc,
         const axis2_env_t *env)
 {
-    axis2_woden_desc_impl_t *desc_impl = NULL;
+    woden_desc_impl_t *desc_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DESC_SUPER_OBJS(desc, env);
+    super = WODEN_DESC_SUPER_OBJS(desc, env);
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DESC", AXIS2_HASH_KEY_STRING));
+                "WODEN_DESC", AXIS2_HASH_KEY_STRING));
 
     desc_impl->f_component_initialized = AXIS2_TRUE;
-    return axis2_woden_component_model_builder_create(env, &(desc_impl->desc));
+    return woden_component_model_builder_create(env, &(desc_impl->desc));
 }
 
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/documentable.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/documentable.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/documentable.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/documentable.c Tue Jun 13 22:23:14 2006
@@ -14,88 +14,88 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/axis2_woden_documentable.h>
-#include <woden/wsdl20/xml/axis2_woden_documentation_element.h>
+#include <woden_documentable.h>
+#include <woden_documentation_element.h>
 
-typedef struct axis2_woden_documentable_impl axis2_woden_documentable_impl_t;
+typedef struct woden_documentable_impl woden_documentable_impl_t;
 
 /** 
  * @brief Documentable Struct Impl
  *   Axis2 Documentable  
  */ 
-struct axis2_woden_documentable_impl
+struct woden_documentable_impl
 {
-    axis2_woden_documentable_t documentable;
-    axis2_woden_wsdl_obj_t *wsdl_obj;
+    woden_documentable_t documentable;
+    woden_wsdl_obj_t *wsdl_obj;
     axis2_hash_t *super;
     axis2_array_list_t *f_doc_elems;
 };
 
-#define INTF_TO_IMPL(documentable) ((axis2_woden_documentable_impl_t *) documentable)
+#define INTF_TO_IMPL(documentable) ((woden_documentable_impl_t *) documentable)
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_documentable_free(
+woden_documentable_free(
         void *documentable,
         const axis2_env_t *env);
 
 axis2_hash_t *AXIS2_CALL 
-axis2_woden_documentable_super_objs(
+woden_documentable_super_objs(
         void *documentable,
         const axis2_env_t *env);
 
-axis2_woden_wsdl_obj_t *AXIS2_CALL
-axis2_woden_documentable_get_base_impl(
+woden_wsdl_obj_t *AXIS2_CALL
+woden_documentable_get_base_impl(
         void *documentable,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_documentable_add_documentation_element(
+woden_documentable_add_documentation_element(
         void *documentable,
         const axis2_env_t *env,
-        axis2_woden_documentation_element_t *documentation);
+        woden_documentation_element_t *documentation);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_documentable_get_documentation_elements(
+woden_documentable_get_documentation_elements(
         void *documentable,
         const axis2_env_t *env);
 
-static axis2_woden_documentable_t *
+static woden_documentable_t *
 create(
         const axis2_env_t *env)
 {
-    axis2_woden_documentable_impl_t *documentable_impl = NULL;
+    woden_documentable_impl_t *documentable_impl = NULL;
    
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     documentable_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_woden_documentable_impl_t));
+                    sizeof(woden_documentable_impl_t));
 
     documentable_impl->f_doc_elems = NULL;
     documentable_impl->super = NULL;
     
     documentable_impl->documentable.ops = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_woden_documentable_ops_t));
+                    sizeof(woden_documentable_ops_t));
 
-    documentable_impl->documentable.ops->free = axis2_woden_documentable_free;
-    documentable_impl->documentable.ops->super_objs = axis2_woden_documentable_super_objs;
-    documentable_impl->documentable.ops->get_base_impl = axis2_woden_documentable_get_base_impl;
+    documentable_impl->documentable.ops->free = woden_documentable_free;
+    documentable_impl->documentable.ops->super_objs = woden_documentable_super_objs;
+    documentable_impl->documentable.ops->get_base_impl = woden_documentable_get_base_impl;
     documentable_impl->documentable.ops->add_documentation_element = 
-        axis2_woden_documentable_add_documentation_element;
+        woden_documentable_add_documentation_element;
     documentable_impl->documentable.ops->get_documentation_elements = 
-        axis2_woden_documentable_get_documentation_elements;
+        woden_documentable_get_documentation_elements;
 
     return &(documentable_impl->documentable);
 }
 
-AXIS2_EXTERN axis2_woden_documentable_t * AXIS2_CALL
-axis2_woden_documentable_create(
+AXIS2_EXTERN woden_documentable_t * AXIS2_CALL
+woden_documentable_create(
         const axis2_env_t *env)
 {
-    axis2_woden_documentable_impl_t *documentable_impl = NULL;
+    woden_documentable_impl_t *documentable_impl = NULL;
    
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    documentable_impl = (axis2_woden_documentable_impl_t *) create(env);
+    documentable_impl = (woden_documentable_impl_t *) create(env);
 
-    documentable_impl->wsdl_obj = axis2_woden_wsdl_obj_create(env);
+    documentable_impl->wsdl_obj = woden_wsdl_obj_create(env);
 
     documentable_impl->super = axis2_hash_make(env);
     if(!documentable_impl->super)
@@ -103,9 +103,9 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(documentable_impl->super, "AXIS2_WODEN_DOCUMENTABLE", 
+    axis2_hash_set(documentable_impl->super, "WODEN_DOCUMENTABLE", 
             AXIS2_HASH_KEY_STRING, &(documentable_impl->documentable));
-    axis2_hash_set(documentable_impl->super, "AXIS2_WODEN_WSDL_OBJ", 
+    axis2_hash_set(documentable_impl->super, "WODEN_WSDL_OBJ", 
             AXIS2_HASH_KEY_STRING, documentable_impl->wsdl_obj);
             
 
@@ -113,11 +113,11 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_documentable_free(
+woden_documentable_free(
         void *documentable,
         const axis2_env_t *env)
 {
-    axis2_woden_documentable_impl_t *documentable_impl = NULL;
+    woden_documentable_impl_t *documentable_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     documentable_impl = INTF_TO_IMPL(documentable);
@@ -130,7 +130,7 @@
     
     if(documentable_impl->wsdl_obj)
     {
-        AXIS2_WODEN_WSDL_OBJ_FREE(documentable_impl->wsdl_obj, env);
+        WODEN_WSDL_OBJ_FREE(documentable_impl->wsdl_obj, env);
         documentable_impl->wsdl_obj = NULL;
     }
 
@@ -155,11 +155,11 @@
 }
 
 axis2_hash_t *AXIS2_CALL
-axis2_woden_documentable_super_objs(
+woden_documentable_super_objs(
         void *documentable,
         const axis2_env_t *env)
 {
-    axis2_woden_documentable_impl_t *documentable_impl = NULL;
+    woden_documentable_impl_t *documentable_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     documentable_impl = INTF_TO_IMPL(documentable);
@@ -167,12 +167,12 @@
     return documentable_impl->super;
 }
 
-axis2_woden_wsdl_obj_t *AXIS2_CALL
-axis2_woden_documentable_get_base_impl(
+woden_wsdl_obj_t *AXIS2_CALL
+woden_documentable_get_base_impl(
         void *documentable,
         const axis2_env_t *env)
 {
-    axis2_woden_documentable_impl_t *documentable_impl = NULL;
+    woden_documentable_impl_t *documentable_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     documentable_impl = INTF_TO_IMPL(documentable);
@@ -181,20 +181,20 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_documentable_resolve_methods(
-        axis2_woden_documentable_t *documentable,
+woden_documentable_resolve_methods(
+        woden_documentable_t *documentable,
         const axis2_env_t *env,
-        axis2_woden_documentable_t *documentable_impl,
+        woden_documentable_t *documentable_impl,
         axis2_hash_t *methods)
 {
-    axis2_woden_documentable_impl_t *documentable_impl_l = NULL;
+    woden_documentable_impl_t *documentable_impl_l = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     documentable_impl_l = INTF_TO_IMPL(documentable_impl);
 
     documentable->ops = AXIS2_MALLOC(env->allocator, 
-                sizeof(axis2_woden_documentable_ops_t));
+                sizeof(woden_documentable_ops_t));
     
     documentable->ops->free = axis2_hash_get(methods, "free", 
             AXIS2_HASH_KEY_STRING);
@@ -219,19 +219,19 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_documentable_add_documentation_element(
+woden_documentable_add_documentation_element(
         void *documentable,
         const axis2_env_t *env,
-        axis2_woden_documentation_element_t *documentation)
+        woden_documentation_element_t *documentation)
 {
-    axis2_woden_documentable_impl_t *documentable_impl = NULL;
+    woden_documentable_impl_t *documentable_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, documentation, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DOCUMENTABLE_SUPER_OBJS(documentable, env);
+    super = WODEN_DOCUMENTABLE_SUPER_OBJS(documentable, env);
     documentable_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DOCUMENTABLE", AXIS2_HASH_KEY_STRING));
+                "WODEN_DOCUMENTABLE", AXIS2_HASH_KEY_STRING));
    
     if(!documentable_impl->f_doc_elems)
     {
@@ -247,17 +247,17 @@
 }
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_documentable_get_documentation_elements(
+woden_documentable_get_documentation_elements(
         void *documentable,
         const axis2_env_t *env)
 {
-    axis2_woden_documentable_impl_t *documentable_impl = NULL;
+    woden_documentable_impl_t *documentable_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_DOCUMENTABLE_SUPER_OBJS(documentable, env);
+    super = WODEN_DOCUMENTABLE_SUPER_OBJS(documentable, env);
     documentable_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_DOCUMENTABLE", AXIS2_HASH_KEY_STRING));
+                "WODEN_DOCUMENTABLE", AXIS2_HASH_KEY_STRING));
    
 
     return documentable_impl->f_doc_elems;



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