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 [25/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/wsdl_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_ref.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_ref.c Tue Jun 13 22:23:14 2006
@@ -14,86 +14,86 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/axis2_woden_wsdl_ref.h>
-#include <woden/wsdl20/extensions/axis2_woden_component_exts.h>
-#include <woden/wsdl20/xml/axis2_woden_desc_element.h>
+#include <woden_wsdl_ref.h>
+#include <woden_component_exts.h>
+#include <woden_desc_element.h>
 
-typedef struct axis2_woden_wsdl_ref_impl axis2_woden_wsdl_ref_impl_t;
+typedef struct woden_wsdl_ref_impl woden_wsdl_ref_impl_t;
 
 /** 
  * @brief Wsdl Ref Struct Impl
  *   Axis2 Wsdl Ref  
  */ 
-struct axis2_woden_wsdl_ref_impl
+struct woden_wsdl_ref_impl
 {
-    axis2_woden_wsdl_ref_t wsdl_ref;
-    axis2_woden_wsdl_element_t *wsdl_element;
+    woden_wsdl_ref_t wsdl_ref;
+    woden_wsdl_element_t *wsdl_element;
     axis2_hash_t *super;
-    axis2_woden_obj_types_t obj_type;
+    woden_obj_types_t obj_type;
     axis2_array_list_t *f_documentation_elements;
     axis2_uri_t *f_location;
-    axis2_woden_desc_element_t *f_desc_element;
+    woden_desc_element_t *f_desc_element;
 };
 
-#define INTF_TO_IMPL(wsdl_ref) ((axis2_woden_wsdl_ref_impl_t *) wsdl_ref)
+#define INTF_TO_IMPL(wsdl_ref) ((woden_wsdl_ref_impl_t *) wsdl_ref)
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_wsdl_ref_free(
+woden_wsdl_ref_free(
         void *wsdl_ref,
         const axis2_env_t *env);
 
 axis2_hash_t *AXIS2_CALL 
-axis2_woden_wsdl_ref_super_objs(
+woden_wsdl_ref_super_objs(
         void *wsdl_ref,
         const axis2_env_t *env);
 
-axis2_woden_wsdl_element_t *AXIS2_CALL
-axis2_woden_wsdl_ref_get_base_impl(
+woden_wsdl_element_t *AXIS2_CALL
+woden_wsdl_ref_get_base_impl(
         void *wsdl_ref,
         const axis2_env_t *env);
 
 axis2_uri_t *AXIS2_CALL
-axis2_woden_wsdl_ref_get_location(
+woden_wsdl_ref_get_location(
         void *wsdl_ref,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_wsdl_ref_set_location(
+woden_wsdl_ref_set_location(
         void *wsdl_ref,
         const axis2_env_t *env,
         axis2_uri_t *loc_uri);
 
 void *AXIS2_CALL
-axis2_woden_wsdl_ref_get_desc_element(
+woden_wsdl_ref_get_desc_element(
         void *wsdl_ref,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_wsdl_ref_set_desc_element(
+woden_wsdl_ref_set_desc_element(
         void *wsdl_ref,
         const axis2_env_t *env,
         void *desc);
 
 axis2_status_t AXIS2_CALL
-axis2_woden_wsdl_ref_add_documentation_element(
+woden_wsdl_ref_add_documentation_element(
         void *wsdl_ref,
         const axis2_env_t *env,
         void *doc_el);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_wsdl_ref_get_documentation_elements(
+woden_wsdl_ref_get_documentation_elements(
         void *wsdl_ref,
         const axis2_env_t *env);
 
-static axis2_woden_wsdl_ref_t *
+static woden_wsdl_ref_t *
 create(
         const axis2_env_t *env)
 {
-    axis2_woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
+    woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
    
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     wsdl_ref_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_woden_wsdl_ref_impl_t));
+                    sizeof(woden_wsdl_ref_impl_t));
 
     wsdl_ref_impl->wsdl_element = NULL;
     wsdl_ref_impl->f_documentation_elements = NULL;
@@ -101,37 +101,37 @@
     wsdl_ref_impl->f_desc_element = NULL;
    
     wsdl_ref_impl->wsdl_ref.ops = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_woden_wsdl_ref_ops_t));
+                    sizeof(woden_wsdl_ref_ops_t));
     
-    wsdl_ref_impl->wsdl_ref.ops->free = axis2_woden_wsdl_ref_free;
-    wsdl_ref_impl->wsdl_ref.ops->super_objs = axis2_woden_wsdl_ref_super_objs;
-    wsdl_ref_impl->wsdl_ref.ops->get_base_impl = axis2_woden_wsdl_ref_get_base_impl;
+    wsdl_ref_impl->wsdl_ref.ops->free = woden_wsdl_ref_free;
+    wsdl_ref_impl->wsdl_ref.ops->super_objs = woden_wsdl_ref_super_objs;
+    wsdl_ref_impl->wsdl_ref.ops->get_base_impl = woden_wsdl_ref_get_base_impl;
     wsdl_ref_impl->wsdl_ref.ops->get_location = 
-        axis2_woden_wsdl_ref_get_location;
+        woden_wsdl_ref_get_location;
     wsdl_ref_impl->wsdl_ref.ops->set_location = 
-        axis2_woden_wsdl_ref_set_location;
+        woden_wsdl_ref_set_location;
     wsdl_ref_impl->wsdl_ref.ops->get_desc_element = 
-        axis2_woden_wsdl_ref_get_desc_element;
+        woden_wsdl_ref_get_desc_element;
     wsdl_ref_impl->wsdl_ref.ops->set_desc_element = 
-        axis2_woden_wsdl_ref_set_desc_element;
+        woden_wsdl_ref_set_desc_element;
     wsdl_ref_impl->wsdl_ref.ops->add_documentation_element = 
-        axis2_woden_wsdl_ref_add_documentation_element;
+        woden_wsdl_ref_add_documentation_element;
     wsdl_ref_impl->wsdl_ref.ops->get_documentation_elements = 
-        axis2_woden_wsdl_ref_get_documentation_elements;
+        woden_wsdl_ref_get_documentation_elements;
 
     return &(wsdl_ref_impl->wsdl_ref);
 }
 
-AXIS2_EXTERN axis2_woden_wsdl_ref_t * AXIS2_CALL
-axis2_woden_wsdl_ref_create(
+AXIS2_EXTERN woden_wsdl_ref_t * AXIS2_CALL
+woden_wsdl_ref_create(
         const axis2_env_t *env)
 {
-    axis2_woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
+    woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
    
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    wsdl_ref_impl = (axis2_woden_wsdl_ref_impl_t *) create(env);
+    wsdl_ref_impl = (woden_wsdl_ref_impl_t *) create(env);
 
-    wsdl_ref_impl->wsdl_element = axis2_woden_wsdl_element_create(env);
+    wsdl_ref_impl->wsdl_element = woden_wsdl_element_create(env);
 
     wsdl_ref_impl->super = axis2_hash_make(env);
     if(!wsdl_ref_impl->super) 
@@ -139,26 +139,26 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(wsdl_ref_impl->super, "AXIS2_WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING, 
+    axis2_hash_set(wsdl_ref_impl->super, "WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING, 
             &(wsdl_ref_impl->wsdl_ref));
-    axis2_hash_set(wsdl_ref_impl->super, "AXIS2_WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING, 
+    axis2_hash_set(wsdl_ref_impl->super, "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING, 
             wsdl_ref_impl->wsdl_element);
     return &(wsdl_ref_impl->wsdl_ref);
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_wsdl_ref_free(
+woden_wsdl_ref_free(
         void *wsdl_ref,
         const axis2_env_t *env)
 {
-    axis2_woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
+    woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     wsdl_ref_impl = INTF_TO_IMPL(wsdl_ref);
 
     if(wsdl_ref_impl->wsdl_element)
     {
-        AXIS2_WODEN_WSDL_ELEMENT_FREE(wsdl_ref_impl->wsdl_element, env);
+        WODEN_WSDL_ELEMENT_FREE(wsdl_ref_impl->wsdl_element, env);
         wsdl_ref_impl->wsdl_element = NULL;
     }
 
@@ -183,11 +183,11 @@
 }
 
 axis2_hash_t *AXIS2_CALL
-axis2_woden_wsdl_ref_super(
+woden_wsdl_ref_super(
         void *wsdl_ref,
         const axis2_env_t *env)
 {
-    axis2_woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
+    woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     wsdl_ref_impl = INTF_TO_IMPL(wsdl_ref);
@@ -195,12 +195,12 @@
     return wsdl_ref_impl->super;
 }
 
-axis2_woden_wsdl_element_t *AXIS2_CALL
-axis2_woden_wsdl_ref_get_base_impl(
+woden_wsdl_element_t *AXIS2_CALL
+woden_wsdl_ref_get_base_impl(
         void *wsdl_ref,
         const axis2_env_t *env)
 {
-    axis2_woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
+    woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     wsdl_ref_impl = INTF_TO_IMPL(wsdl_ref);
@@ -209,13 +209,13 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_wsdl_ref_resolve_methods(
-        axis2_woden_wsdl_ref_t *wsdl_ref,
+woden_wsdl_ref_resolve_methods(
+        woden_wsdl_ref_t *wsdl_ref,
         const axis2_env_t *env,
-        axis2_woden_wsdl_ref_t *wsdl_ref_impl,
+        woden_wsdl_ref_t *wsdl_ref_impl,
         axis2_hash_t *methods)
 {
-    axis2_woden_wsdl_ref_impl_t *wsdl_ref_impl_l = NULL;
+    woden_wsdl_ref_impl_t *wsdl_ref_impl_l = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
@@ -270,34 +270,34 @@
 }
 
 axis2_uri_t *AXIS2_CALL
-axis2_woden_wsdl_ref_get_location(
+woden_wsdl_ref_get_location(
         void *wsdl_ref,
         const axis2_env_t *env)
 {
-    axis2_woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
+    woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
+    super = WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
     wsdl_ref_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
+                "WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
 
     return wsdl_ref_impl->f_location;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_wsdl_ref_set_location(
+woden_wsdl_ref_set_location(
         void *wsdl_ref,
         const axis2_env_t *env,
         axis2_uri_t *loc_uri)
 {
-    axis2_woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
+    woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
+    super = WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
     wsdl_ref_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
+                "WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
 
     if(wsdl_ref_impl->f_location)
     {
@@ -308,34 +308,34 @@
 }
 
 void *AXIS2_CALL
-axis2_woden_wsdl_ref_get_desc_element(
+woden_wsdl_ref_get_desc_element(
         void *wsdl_ref,
         const axis2_env_t *env)
 {
-    axis2_woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
+    woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
+    super = WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
     wsdl_ref_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
+                "WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
 
     return wsdl_ref_impl->f_desc_element;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_wsdl_ref_set_desc_element(
+woden_wsdl_ref_set_desc_element(
         void *wsdl_ref,
         const axis2_env_t *env,
         void *desc)
 {
-    axis2_woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
+    woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
+    super = WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
     wsdl_ref_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
+                "WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
 
     if(wsdl_ref_impl->f_desc_element)
     {
@@ -346,18 +346,18 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_wsdl_ref_add_documentation_element(
+woden_wsdl_ref_add_documentation_element(
         void *wsdl_ref,
         const axis2_env_t *env,
         void *doc_el)
 {
-    axis2_woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
+    woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
+    super = WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
     wsdl_ref_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
+                "WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
 
     if(!wsdl_ref_impl->f_documentation_elements)
     {
@@ -373,17 +373,17 @@
 }
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_wsdl_ref_get_documentation_elements(
+woden_wsdl_ref_get_documentation_elements(
         void *wsdl_ref,
         const axis2_env_t *env)
 {
-    axis2_woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
+    woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
     axis2_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    super = AXIS2_WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
+    super = WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
     wsdl_ref_impl = INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
+                "WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
 
     return wsdl_ref_impl->f_documentation_elements;
 }

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_binding_element.h>
+#include <woden_binding_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_binding_element_resolve_methods(
-        axis2_woden_binding_element_t *binding_element,
+woden_binding_element_resolve_methods(
+        woden_binding_element_t *binding_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_binding_fault_element.h>
+#include <woden_binding_fault_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_binding_fault_element_resolve_methods(
-        axis2_woden_binding_fault_element_t *binding_fault_element,
+woden_binding_fault_element_resolve_methods(
+        woden_binding_fault_element_t *binding_fault_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_ref_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_ref_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_ref_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_ref_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_binding_fault_ref_element.h>
+#include <woden_binding_fault_ref_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_binding_fault_ref_element_resolve_methods(
-        axis2_woden_binding_fault_ref_element_t *binding_fault_ref_element,
+woden_binding_fault_ref_element_resolve_methods(
+        woden_binding_fault_ref_element_t *binding_fault_ref_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_msg_ref_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_msg_ref_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_msg_ref_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_msg_ref_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_binding_msg_ref_element.h>
+#include <woden_binding_msg_ref_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_binding_msg_ref_element_resolve_methods(
-        axis2_woden_binding_msg_ref_element_t *binding_msg_ref_element,
+woden_binding_msg_ref_element_resolve_methods(
+        woden_binding_msg_ref_element_t *binding_msg_ref_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_op_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_op_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_op_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_op_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_binding_op_element.h>
+#include <woden_binding_op_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_binding_op_element_resolve_methods(
-        axis2_woden_binding_op_element_t *binding_op_element,
+woden_binding_op_element_resolve_methods(
+        woden_binding_op_element_t *binding_op_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/configurable_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/configurable_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/configurable_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/configurable_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_configurable_element.h>
+#include <woden_configurable_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_configurable_element_resolve_methods(
-        axis2_woden_configurable_element_t *configurable_element,
+woden_configurable_element_resolve_methods(
+        woden_configurable_element_t *configurable_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

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=414079&r1=414078&r2=414079&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 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_desc_element.h>
+#include <woden_desc_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_desc_element_resolve_methods(
-        axis2_woden_desc_element_t *desc_element,
+woden_desc_element_resolve_methods(
+        woden_desc_element_t *desc_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentable_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentable_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentable_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentable_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_documentable_element.h>
+#include <woden_documentable_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_documentable_element_resolve_methods(
-        axis2_woden_documentable_element_t *documentable_element,
+woden_documentable_element_resolve_methods(
+        woden_documentable_element_t *documentable_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentation_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentation_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentation_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentation_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_documentation_element.h>
+#include <woden_documentation_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_documentation_element_resolve_methods(
-        axis2_woden_documentation_element_t *documentation_element,
+woden_documentation_element_resolve_methods(
+        woden_documentation_element_t *documentation_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/endpoint_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/endpoint_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/endpoint_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/endpoint_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_endpoint_element.h>
+#include <woden_endpoint_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_endpoint_element_resolve_methods(
-        axis2_woden_endpoint_element_t *endpoint_element,
+woden_endpoint_element_resolve_methods(
+        woden_endpoint_element_t *endpoint_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/fault_ref_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/fault_ref_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/fault_ref_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/fault_ref_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_interface_fault_ref_element.h>
+#include <woden_interface_fault_ref_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_fault_ref_element_resolve_methods(
-        axis2_woden_interface_fault_ref_element_t *interface_fault_ref_element,
+woden_fault_ref_element_resolve_methods(
+        woden_interface_fault_ref_element_t *interface_fault_ref_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/feature_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/feature_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/feature_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/feature_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_feature_element.h>
+#include <woden_feature_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_feature_element_resolve_methods(
-        axis2_woden_feature_element_t *feature_element,
+woden_feature_element_resolve_methods(
+        woden_feature_element_t *feature_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/import_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/import_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/import_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/import_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_import_element.h>
+#include <woden_import_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_import_element_resolve_methods(
-        axis2_woden_import_element_t *import_element,
+woden_import_element_resolve_methods(
+        woden_import_element_t *import_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/include_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/include_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/include_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/include_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_include_element.h>
+#include <woden_include_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_include_element_resolve_methods(
-        axis2_woden_include_element_t *include_element,
+woden_include_element_resolve_methods(
+        woden_include_element_t *include_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_interface_element.h>
+#include <woden_interface_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_interface_element_resolve_methods(
-        axis2_woden_interface_element_t *interface_element,
+woden_interface_element_resolve_methods(
+        woden_interface_element_t *interface_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_interface_fault_element.h>
+#include <woden_interface_fault_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_interface_fault_element_resolve_methods(
-        axis2_woden_interface_fault_element_t *interface_fault_element,
+woden_interface_fault_element_resolve_methods(
+        woden_interface_fault_element_t *interface_fault_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_ref_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_ref_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_ref_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_ref_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_interface_fault_ref_element.h>
+#include <woden_interface_fault_ref_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_interface_fault_ref_element_resolve_methods(
-        axis2_woden_interface_fault_ref_element_t *interface_fault_ref_element,
+woden_interface_fault_ref_element_resolve_methods(
+        woden_interface_fault_ref_element_t *interface_fault_ref_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_msg_ref_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_msg_ref_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_msg_ref_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_msg_ref_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_interface_msg_ref_element.h>
+#include <woden_interface_msg_ref_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_interface_msg_ref_element_resolve_methods(
-        axis2_woden_interface_msg_ref_element_t *interface_msg_ref_element,
+woden_interface_msg_ref_element_resolve_methods(
+        woden_interface_msg_ref_element_t *interface_msg_ref_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_op_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_op_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_op_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_op_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_interface_op_element.h>
+#include <woden_interface_op_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_interface_op_element_resolve_methods(
-        axis2_woden_interface_op_element_t *interface_op_element,
+woden_interface_op_element_resolve_methods(
+        woden_interface_op_element_t *interface_op_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/nested_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/nested_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/nested_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/nested_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_nested_element.h>
+#include <woden_nested_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_nested_element_resolve_methods(
-        axis2_woden_nested_element_t *nested_element,
+woden_nested_element_resolve_methods(
+        woden_nested_element_t *nested_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/property_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/property_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/property_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/property_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_property_element.h>
+#include <woden_property_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_property_element_resolve_methods(
-        axis2_woden_property_element_t *property_element,
+woden_property_element_resolve_methods(
+        woden_property_element_t *property_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/svc_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/svc_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/svc_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/svc_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_svc_element.h>
+#include <woden_svc_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_svc_element_resolve_methods(
-        axis2_woden_svc_element_t *svc_element,
+woden_svc_element_resolve_methods(
+        woden_svc_element_t *svc_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/types_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/types_element.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/types_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/types_element.c Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <woden/wsdl20/xml/axis2_woden_types_element.h>
+#include <woden_types_element.h>
 
 axis2_status_t AXIS2_CALL
-axis2_woden_types_element_resolve_methods(
-        axis2_woden_types_element_t *types_element,
+woden_types_element_resolve_methods(
+        woden_types_element_t *types_element,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {

Modified: webservices/axis2/trunk/c/woden/src/xml/bool_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/bool_attr.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/bool_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/bool_attr.c Tue Jun 13 22:23:14 2006
@@ -14,78 +14,78 @@
  * limitations under the License.
  */
 
-#include <woden/xml/axis2_woden_bool_attr.h>
-#include <woden/xml/axis2_woden_xml_attr.h>
+#include <woden_bool_attr.h>
+#include <woden_xml_attr.h>
 #include <axiom_element.h>
 #include <axiom_node.h>
 
-typedef struct axis2_woden_bool_attr_impl axis2_woden_bool_attr_impl_t;
+typedef struct woden_bool_attr_impl woden_bool_attr_impl_t;
 
 /** 
  * @brief Bool Attribute Struct Impl
  *   Axis2 Bool Attribute  
  */ 
-struct axis2_woden_bool_attr_impl
+struct woden_bool_attr_impl
 {
-    axis2_woden_bool_attr_t bool_attr;
-    axis2_woden_xml_attr_t *xml_attr;
-    axis2_woden_obj_types_t obj_type;
+    woden_bool_attr_t bool_attr;
+    woden_xml_attr_t *xml_attr;
+    woden_obj_types_t obj_type;
     axis2_hash_t *methods;
 };
 
 #define INTF_TO_IMPL(bool_attr) \
-    ((axis2_woden_bool_attr_impl_t *) bool_attr)
+    ((woden_bool_attr_impl_t *) bool_attr)
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_bool_attr_free(void *bool_attr,
+woden_bool_attr_free(void *bool_attr,
                         const axis2_env_t *env);
 
-axis2_woden_obj_types_t AXIS2_CALL 
-axis2_woden_bool_attr_type(void *bool_attr,
+woden_obj_types_t AXIS2_CALL 
+woden_bool_attr_type(void *bool_attr,
                         const axis2_env_t *env);
 
-axis2_woden_xml_attr_t *AXIS2_CALL
-axis2_woden_bool_attr_get_base_impl(void *bool_attr,
+woden_xml_attr_t *AXIS2_CALL
+woden_bool_attr_get_base_impl(void *bool_attr,
                                 const axis2_env_t *env);
 
 axis2_bool_t AXIS2_CALL
-axis2_woden_bool_attr_get_boolean(void *bool_attr,
+woden_bool_attr_get_boolean(void *bool_attr,
                                     const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_bool_attr_convert(void *bool_attr,
+woden_bool_attr_convert(void *bool_attr,
                                 const axis2_env_t *env,
                                 axiom_element_t *owner_el,
                                 axiom_node_t *owner_node,
                                 axis2_char_t *attr_value);
 
-static axis2_woden_bool_attr_t *
+static woden_bool_attr_t *
 create(
         const axis2_env_t *env)
 {
-    axis2_woden_bool_attr_impl_t *bool_attr_impl = NULL;
+    woden_bool_attr_impl_t *bool_attr_impl = NULL;
      
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     bool_attr_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_woden_bool_attr_impl_t));
+                    sizeof(woden_bool_attr_impl_t));
 
-    bool_attr_impl->obj_type = AXIS2_WODEN_BOOL_ATTR;
+    bool_attr_impl->obj_type = WODEN_BOOL_ATTR;
     bool_attr_impl->xml_attr = NULL;
     bool_attr_impl->methods = NULL;
     bool_attr_impl->bool_attr.ops = 
         AXIS2_MALLOC(env->allocator, 
-                sizeof(axis2_woden_bool_attr_ops_t));
+                sizeof(woden_bool_attr_ops_t));
 
     bool_attr_impl->bool_attr.ops->free = 
-        axis2_woden_bool_attr_free;
+        woden_bool_attr_free;
     bool_attr_impl->bool_attr.ops->type = 
-        axis2_woden_bool_attr_type;
+        woden_bool_attr_type;
     bool_attr_impl->bool_attr.ops->get_base_impl = 
-        axis2_woden_bool_attr_get_base_impl;
+        woden_bool_attr_get_base_impl;
     bool_attr_impl->bool_attr.ops->get_boolean = 
-        axis2_woden_bool_attr_get_boolean;
+        woden_bool_attr_get_boolean;
     bool_attr_impl->bool_attr.ops->convert = 
-        axis2_woden_bool_attr_convert;
+        woden_bool_attr_convert;
     
     
     bool_attr_impl->methods = axis2_hash_make(env);
@@ -95,13 +95,13 @@
         return NULL;
     }
     axis2_hash_set(bool_attr_impl->methods, "free", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_bool_attr_free);
+            AXIS2_HASH_KEY_STRING, woden_bool_attr_free);
     axis2_hash_set(bool_attr_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_bool_attr_type);
+            AXIS2_HASH_KEY_STRING, woden_bool_attr_type);
     axis2_hash_set(bool_attr_impl->methods, "get_boolean", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_bool_attr_get_boolean);
+            AXIS2_HASH_KEY_STRING, woden_bool_attr_get_boolean);
     axis2_hash_set(bool_attr_impl->methods, "convert", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_bool_attr_convert);
+            AXIS2_HASH_KEY_STRING, woden_bool_attr_convert);
 
     return &(bool_attr_impl->bool_attr);
 }
@@ -109,30 +109,30 @@
  * TODO This constructor is not used for extension attributes, but may be useful if
  * parsing of native WSDL attributes is changed to use the XMLAttr interface.
  */
-AXIS2_EXTERN axis2_woden_bool_attr_t * AXIS2_CALL
-axis2_woden_bool_attr_create(
+AXIS2_EXTERN woden_bool_attr_t * AXIS2_CALL
+woden_bool_attr_create(
         const axis2_env_t *env,
         axiom_element_t *owner_el,
         axiom_node_t *owner_node,
         axis2_qname_t *attr_type,
         axis2_char_t *attr_value)
 {
-    axis2_woden_bool_attr_impl_t *bool_attr_impl = NULL;
+    woden_bool_attr_impl_t *bool_attr_impl = NULL;
      
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    bool_attr_impl = (axis2_woden_bool_attr_impl_t *) create(env);
+    bool_attr_impl = (woden_bool_attr_impl_t *) create(env);
 
-    bool_attr_impl->xml_attr = axis2_woden_xml_attr_create(env, owner_el, 
+    bool_attr_impl->xml_attr = woden_xml_attr_create(env, owner_el, 
             owner_node, attr_type, attr_value);
     return &(bool_attr_impl->bool_attr);
 }
 
-axis2_woden_obj_types_t AXIS2_CALL
-axis2_woden_bool_attr_type(
+woden_obj_types_t AXIS2_CALL
+woden_bool_attr_type(
         void *bool_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_bool_attr_impl_t *bool_attr_impl = NULL;
+    woden_bool_attr_impl_t *bool_attr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     bool_attr_impl = INTF_TO_IMPL(bool_attr);
@@ -141,10 +141,10 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_bool_attr_free(void *bool_attr,
+woden_bool_attr_free(void *bool_attr,
                         const axis2_env_t *env)
 {
-    axis2_woden_bool_attr_impl_t *bool_attr_impl = NULL;
+    woden_bool_attr_impl_t *bool_attr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     bool_attr_impl = INTF_TO_IMPL(bool_attr);
@@ -157,7 +157,7 @@
 
     if(bool_attr_impl->xml_attr)
     {
-        AXIS2_WODEN_XML_ATTR_FREE(bool_attr_impl->xml_attr, env);
+        WODEN_XML_ATTR_FREE(bool_attr_impl->xml_attr, env);
         bool_attr_impl->xml_attr = NULL;
     }
     
@@ -175,11 +175,11 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_woden_xml_attr_t *AXIS2_CALL
-axis2_woden_bool_attr_get_base_impl(void *bool_attr,
+woden_xml_attr_t *AXIS2_CALL
+woden_bool_attr_get_base_impl(void *bool_attr,
                                 const axis2_env_t *env)
 {
-    axis2_woden_bool_attr_impl_t *bool_attr_impl = NULL;
+    woden_bool_attr_impl_t *bool_attr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     bool_attr_impl = INTF_TO_IMPL(bool_attr);
@@ -188,8 +188,8 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_bool_attr_resolve_methods(
-                    axis2_woden_bool_attr_t *bool_attr,
+woden_bool_attr_resolve_methods(
+                    woden_bool_attr_t *bool_attr,
                     const axis2_env_t *env,
                     axis2_hash_t *methods)
 {
@@ -211,27 +211,27 @@
 }
 
 axis2_bool_t AXIS2_CALL
-axis2_woden_bool_attr_get_boolean(void *bool_attr,
+woden_bool_attr_get_boolean(void *bool_attr,
                                     const axis2_env_t *env)
 {
-    axis2_woden_bool_attr_impl_t *bool_attr_impl = NULL;
+    woden_bool_attr_impl_t *bool_attr_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     bool_attr_impl = INTF_TO_IMPL(bool_attr);
-    /* TODO return AXIS2_WODEN_XML_ATTR_GET_CONTENT(
+    /* TODO return WODEN_XML_ATTR_GET_CONTENT(
             bool_attr_impl->xml_attr, env);
      */
     return AXIS2_FALSE;
 }
 
 void *AXIS2_CALL
-axis2_woden_bool_attr_convert(void *bool_attr,
+woden_bool_attr_convert(void *bool_attr,
                                 const axis2_env_t *env,
                                 axiom_element_t *owner_el,
                                 axiom_node_t *owner_node,
                                 axis2_char_t *attr_value)
 {
-    axis2_woden_bool_attr_impl_t *bool_attr_impl = NULL;
+    woden_bool_attr_impl_t *bool_attr_impl = NULL;
     axis2_qname_t *qn = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -244,7 +244,7 @@
     
     if(!qn)
     {
-        AXIS2_WODEN_XML_ATTR_SET_VALID(bool_attr_impl->xml_attr, env, AXIS2_FALSE);
+        WODEN_XML_ATTR_SET_VALID(bool_attr_impl->xml_attr, env, AXIS2_FALSE);
         /* TODO handler error */
     }
     

Modified: webservices/axis2/trunk/c/woden/src/xml/qname_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/qname_attr.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/qname_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/qname_attr.c Tue Jun 13 22:23:14 2006
@@ -14,50 +14,50 @@
  * limitations under the License.
  */
 
-#include <woden/xml/axis2_woden_qname_attr.h>
-#include <woden/xml/axis2_woden_xml_attr.h>
+#include <woden_qname_attr.h>
+#include <woden_xml_attr.h>
 #include <axiom_element.h>
 #include <axiom_node.h>
 
-typedef struct axis2_woden_qname_attr_impl axis2_woden_qname_attr_impl_t;
+typedef struct woden_qname_attr_impl woden_qname_attr_impl_t;
 
 /** 
  * @brief Qname Attribute Struct Impl
  *   Axis2 Qname Attribute  
  */ 
-struct axis2_woden_qname_attr_impl
+struct woden_qname_attr_impl
 {
-    axis2_woden_qname_attr_t qname_attr;
-    axis2_woden_xml_attr_t *xml_attr;
-    axis2_woden_obj_types_t obj_type;
+    woden_qname_attr_t qname_attr;
+    woden_xml_attr_t *xml_attr;
+    woden_obj_types_t obj_type;
     axis2_hash_t *methods;
 };
 
 #define INTF_TO_IMPL(qname_attr) \
-    ((axis2_woden_qname_attr_impl_t *) qname_attr)
+    ((woden_qname_attr_impl_t *) qname_attr)
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_qname_attr_free(
+woden_qname_attr_free(
         void *qname_attr,
         const axis2_env_t *env);
 
-axis2_woden_obj_types_t AXIS2_CALL 
-axis2_woden_qname_attr_type(
+woden_obj_types_t AXIS2_CALL 
+woden_qname_attr_type(
         void *qname_attr,
         const axis2_env_t *env);
 
-axis2_woden_xml_attr_t *AXIS2_CALL
-axis2_woden_qname_attr_get_base_impl(
+woden_xml_attr_t *AXIS2_CALL
+woden_qname_attr_get_base_impl(
         void *qname_attr,
         const axis2_env_t *env);
 
 axis2_qname_t *AXIS2_CALL
-axis2_woden_qname_attr_get_qname(
+woden_qname_attr_get_qname(
         void *qname_attr,
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_qname_attr_convert(
+woden_qname_attr_convert(
         void *qname_attr,
         const axis2_env_t *env,
         axiom_element_t *owner_el,
@@ -68,37 +68,37 @@
  * TODO This constructor is not used for extension attributes, but may be useful if
  * parsing of native WSDL attributes is changed to use the XMLAttr interface.
  */
-AXIS2_EXTERN axis2_woden_qname_attr_t * AXIS2_CALL
-axis2_woden_qname_attr_create(
+AXIS2_EXTERN woden_qname_attr_t * AXIS2_CALL
+woden_qname_attr_create(
         const axis2_env_t *env,
         axiom_element_t *owner_el,
         axiom_node_t *owner_node,
         axis2_qname_t *attr_type,
         axis2_char_t *attr_value)
 {
-    axis2_woden_qname_attr_impl_t *qname_attr_impl = NULL;
+    woden_qname_attr_impl_t *qname_attr_impl = NULL;
      
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     qname_attr_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_woden_qname_attr_impl_t));
+                    sizeof(woden_qname_attr_impl_t));
 
-    qname_attr_impl->obj_type = AXIS2_WODEN_QNAME_ATTR;
+    qname_attr_impl->obj_type = WODEN_QNAME_ATTR;
     qname_attr_impl->xml_attr = NULL;
     qname_attr_impl->methods = NULL;
     qname_attr_impl->qname_attr.ops = 
         AXIS2_MALLOC(env->allocator, 
-                sizeof(axis2_woden_qname_attr_ops_t));
+                sizeof(woden_qname_attr_ops_t));
 
     qname_attr_impl->qname_attr.ops->free = 
-        axis2_woden_qname_attr_free;
+        woden_qname_attr_free;
     qname_attr_impl->qname_attr.ops->type = 
-        axis2_woden_qname_attr_type;
+        woden_qname_attr_type;
     qname_attr_impl->qname_attr.ops->get_base_impl = 
-        axis2_woden_qname_attr_get_base_impl;
+        woden_qname_attr_get_base_impl;
     qname_attr_impl->qname_attr.ops->get_qname = 
-        axis2_woden_qname_attr_get_qname;
+        woden_qname_attr_get_qname;
     qname_attr_impl->qname_attr.ops->convert = 
-        axis2_woden_qname_attr_convert;
+        woden_qname_attr_convert;
     
     
     qname_attr_impl->methods = axis2_hash_make(env);
@@ -108,26 +108,26 @@
         return NULL;
     }
     axis2_hash_set(qname_attr_impl->methods, "free", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_qname_attr_free);
+            AXIS2_HASH_KEY_STRING, woden_qname_attr_free);
     axis2_hash_set(qname_attr_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_qname_attr_type);
+            AXIS2_HASH_KEY_STRING, woden_qname_attr_type);
     axis2_hash_set(qname_attr_impl->methods, "get_qname", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_qname_attr_get_qname);
+            AXIS2_HASH_KEY_STRING, woden_qname_attr_get_qname);
     axis2_hash_set(qname_attr_impl->methods, "convert", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_qname_attr_convert);
+            AXIS2_HASH_KEY_STRING, woden_qname_attr_convert);
 
-    qname_attr_impl->xml_attr = axis2_woden_xml_attr_create(env, owner_el, 
+    qname_attr_impl->xml_attr = woden_xml_attr_create(env, owner_el, 
             owner_node, attr_type, attr_value);
     
     return &(qname_attr_impl->qname_attr);
 }
 
-axis2_woden_obj_types_t AXIS2_CALL
-axis2_woden_qname_attr_type(
+woden_obj_types_t AXIS2_CALL
+woden_qname_attr_type(
         void *qname_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_attr_impl_t *qname_attr_impl = NULL;
+    woden_qname_attr_impl_t *qname_attr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     qname_attr_impl = INTF_TO_IMPL(qname_attr);
@@ -136,11 +136,11 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_qname_attr_free(
+woden_qname_attr_free(
         void *qname_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_attr_impl_t *qname_attr_impl = NULL;
+    woden_qname_attr_impl_t *qname_attr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     qname_attr_impl = INTF_TO_IMPL(qname_attr);
@@ -153,7 +153,7 @@
 
     if(qname_attr_impl->xml_attr)
     {
-        AXIS2_WODEN_XML_ATTR_FREE(qname_attr_impl->xml_attr, env);
+        WODEN_XML_ATTR_FREE(qname_attr_impl->xml_attr, env);
         qname_attr_impl->xml_attr = NULL;
     }
     
@@ -171,12 +171,12 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_woden_xml_attr_t *AXIS2_CALL
-axis2_woden_qname_attr_get_base_impl(
+woden_xml_attr_t *AXIS2_CALL
+woden_qname_attr_get_base_impl(
         void *qname_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_attr_impl_t *qname_attr_impl = NULL;
+    woden_qname_attr_impl_t *qname_attr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     qname_attr_impl = INTF_TO_IMPL(qname_attr);
@@ -185,8 +185,8 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_qname_attr_resolve_methods(
-        axis2_woden_qname_attr_t *qname_attr,
+woden_qname_attr_resolve_methods(
+        woden_qname_attr_t *qname_attr,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {
@@ -208,27 +208,27 @@
 }
 
 axis2_qname_t *AXIS2_CALL
-axis2_woden_qname_attr_get_qname(
+woden_qname_attr_get_qname(
         void *qname_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_attr_impl_t *qname_attr_impl = NULL;
+    woden_qname_attr_impl_t *qname_attr_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     qname_attr_impl = INTF_TO_IMPL(qname_attr);
-    return (axis2_qname_t *) AXIS2_WODEN_XML_ATTR_GET_CONTENT(
+    return (axis2_qname_t *) WODEN_XML_ATTR_GET_CONTENT(
             qname_attr_impl->xml_attr, env);
 }
 
 void *AXIS2_CALL
-axis2_woden_qname_attr_convert(
+woden_qname_attr_convert(
         void *qname_attr,
         const axis2_env_t *env,
         axiom_element_t *owner_el,
         axiom_node_t *owner_node,
         axis2_char_t *attr_value)
 {
-    axis2_woden_qname_attr_impl_t *qname_attr_impl = NULL;
+    woden_qname_attr_impl_t *qname_attr_impl = NULL;
     axis2_qname_t *qn = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -241,7 +241,7 @@
     
     if(!qn)
     {
-        AXIS2_WODEN_XML_ATTR_SET_VALID(qname_attr_impl->xml_attr, env, AXIS2_FALSE);
+        WODEN_XML_ATTR_SET_VALID(qname_attr_impl->xml_attr, env, AXIS2_FALSE);
         /* TODO handler error */
     }
     

Modified: webservices/axis2/trunk/c/woden/src/xml/qname_list_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/qname_list_attr.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/qname_list_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/qname_list_attr.c Tue Jun 13 22:23:14 2006
@@ -14,50 +14,50 @@
  * limitations under the License.
  */
 
-#include <woden/xml/axis2_woden_qname_list_attr.h>
-#include <woden/xml/axis2_woden_xml_attr.h>
+#include <woden_qname_list_attr.h>
+#include <woden_xml_attr.h>
 #include <axiom_element.h>
 #include <axiom_node.h>
 
-typedef struct axis2_woden_qname_list_attr_impl axis2_woden_qname_list_attr_impl_t;
+typedef struct woden_qname_list_attr_impl woden_qname_list_attr_impl_t;
 
 /** 
  * @brief QName List Attribute Struct Impl
  *   Axis2 QName List Attribute  
  */ 
-struct axis2_woden_qname_list_attr_impl
+struct woden_qname_list_attr_impl
 {
-    axis2_woden_qname_list_attr_t qname_list_attr;
-    axis2_woden_xml_attr_t *xml_attr;
-    axis2_woden_obj_types_t obj_type;
+    woden_qname_list_attr_t qname_list_attr;
+    woden_xml_attr_t *xml_attr;
+    woden_obj_types_t obj_type;
     axis2_hash_t *methods;
 };
 
 #define INTF_TO_IMPL(qname_list_attr) \
-    ((axis2_woden_qname_list_attr_impl_t *) qname_list_attr)
+    ((woden_qname_list_attr_impl_t *) qname_list_attr)
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_qname_list_attr_free(
+woden_qname_list_attr_free(
         void *qname_list_attr,
         const axis2_env_t *env);
 
-axis2_woden_obj_types_t AXIS2_CALL 
-axis2_woden_qname_list_attr_type(
+woden_obj_types_t AXIS2_CALL 
+woden_qname_list_attr_type(
         void *qname_list_attr,
         const axis2_env_t *env);
 
-axis2_woden_xml_attr_t *AXIS2_CALL
-axis2_woden_qname_list_attr_get_base_impl(
+woden_xml_attr_t *AXIS2_CALL
+woden_qname_list_attr_get_base_impl(
         void *qname_list_attr,
         const axis2_env_t *env);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_qname_list_attr_get_qnames(
+woden_qname_list_attr_get_qnames(
         void *qname_list_attr,
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_qname_list_attr_convert(
+woden_qname_list_attr_convert(
         void *qname_list_attr,
         const axis2_env_t *env,
         axiom_element_t *owner_el,
@@ -68,37 +68,37 @@
  * TODO This constructor is not used for extension attributes, but may be useful if
  * parsing of native WSDL attributes is changed to use the XMLAttr interface.
  */
-AXIS2_EXTERN axis2_woden_qname_list_attr_t * AXIS2_CALL
-axis2_woden_qname_list_attr_create(
+AXIS2_EXTERN woden_qname_list_attr_t * AXIS2_CALL
+woden_qname_list_attr_create(
         const axis2_env_t *env,
         axiom_element_t *owner_el,
         axiom_node_t *owner_node,
         axis2_qname_t *attr_type,
         axis2_char_t *attr_value)
 {
-    axis2_woden_qname_list_attr_impl_t *qname_list_attr_impl = NULL;
+    woden_qname_list_attr_impl_t *qname_list_attr_impl = NULL;
      
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     qname_list_attr_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_woden_qname_list_attr_impl_t));
+                    sizeof(woden_qname_list_attr_impl_t));
 
-    qname_list_attr_impl->obj_type = AXIS2_WODEN_QNAME_LIST_ATTR;
+    qname_list_attr_impl->obj_type = WODEN_QNAME_LIST_ATTR;
     qname_list_attr_impl->xml_attr = NULL;
     qname_list_attr_impl->methods = NULL;
     qname_list_attr_impl->qname_list_attr.ops = 
         AXIS2_MALLOC(env->allocator, 
-                sizeof(axis2_woden_qname_list_attr_ops_t));
+                sizeof(woden_qname_list_attr_ops_t));
 
     qname_list_attr_impl->qname_list_attr.ops->free = 
-        axis2_woden_qname_list_attr_free;
+        woden_qname_list_attr_free;
     qname_list_attr_impl->qname_list_attr.ops->type = 
-        axis2_woden_qname_list_attr_type;
+        woden_qname_list_attr_type;
     qname_list_attr_impl->qname_list_attr.ops->get_base_impl = 
-        axis2_woden_qname_list_attr_get_base_impl;
+        woden_qname_list_attr_get_base_impl;
     qname_list_attr_impl->qname_list_attr.ops->get_qnames = 
-        axis2_woden_qname_list_attr_get_qnames;
+        woden_qname_list_attr_get_qnames;
     qname_list_attr_impl->qname_list_attr.ops->convert = 
-        axis2_woden_qname_list_attr_convert;
+        woden_qname_list_attr_convert;
     
     
     qname_list_attr_impl->methods = axis2_hash_make(env);
@@ -108,26 +108,26 @@
         return NULL;
     }
     axis2_hash_set(qname_list_attr_impl->methods, "free", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_qname_list_attr_free);
+            AXIS2_HASH_KEY_STRING, woden_qname_list_attr_free);
     axis2_hash_set(qname_list_attr_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_qname_list_attr_type);
+            AXIS2_HASH_KEY_STRING, woden_qname_list_attr_type);
     axis2_hash_set(qname_list_attr_impl->methods, "get_qnames", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_qname_list_attr_get_qnames);
+            AXIS2_HASH_KEY_STRING, woden_qname_list_attr_get_qnames);
     axis2_hash_set(qname_list_attr_impl->methods, "convert", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_qname_list_attr_convert);
+            AXIS2_HASH_KEY_STRING, woden_qname_list_attr_convert);
 
-    qname_list_attr_impl->xml_attr = axis2_woden_xml_attr_create(env, owner_el, 
+    qname_list_attr_impl->xml_attr = woden_xml_attr_create(env, owner_el, 
             owner_node, attr_type, attr_value);
     
     return &(qname_list_attr_impl->qname_list_attr);
 }
 
-axis2_woden_obj_types_t AXIS2_CALL
-axis2_woden_qname_list_attr_type(
+woden_obj_types_t AXIS2_CALL
+woden_qname_list_attr_type(
         void *qname_list_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_list_attr_impl_t *qname_list_attr_impl = NULL;
+    woden_qname_list_attr_impl_t *qname_list_attr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     qname_list_attr_impl = INTF_TO_IMPL(qname_list_attr);
@@ -136,11 +136,11 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_qname_list_attr_free(
+woden_qname_list_attr_free(
         void *qname_list_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_list_attr_impl_t *qname_list_attr_impl = NULL;
+    woden_qname_list_attr_impl_t *qname_list_attr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     qname_list_attr_impl = INTF_TO_IMPL(qname_list_attr);
@@ -153,7 +153,7 @@
 
     if(qname_list_attr_impl->xml_attr)
     {
-        AXIS2_WODEN_XML_ATTR_FREE(qname_list_attr_impl->xml_attr, env);
+        WODEN_XML_ATTR_FREE(qname_list_attr_impl->xml_attr, env);
         qname_list_attr_impl->xml_attr = NULL;
     }
     
@@ -171,12 +171,12 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_woden_xml_attr_t *AXIS2_CALL
-axis2_woden_qname_list_attr_get_base_impl(
+woden_xml_attr_t *AXIS2_CALL
+woden_qname_list_attr_get_base_impl(
         void *qname_list_attr,
                                 const axis2_env_t *env)
 {
-    axis2_woden_qname_list_attr_impl_t *qname_list_attr_impl = NULL;
+    woden_qname_list_attr_impl_t *qname_list_attr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     qname_list_attr_impl = INTF_TO_IMPL(qname_list_attr);
@@ -185,8 +185,8 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_qname_list_attr_resolve_methods(
-        axis2_woden_qname_list_attr_t *qname_list_attr,
+woden_qname_list_attr_resolve_methods(
+        woden_qname_list_attr_t *qname_list_attr,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {
@@ -208,27 +208,27 @@
 }
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_qname_list_attr_get_qnames(
+woden_qname_list_attr_get_qnames(
         void *qname_list_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_list_attr_impl_t *qname_list_attr_impl = NULL;
+    woden_qname_list_attr_impl_t *qname_list_attr_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     qname_list_attr_impl = INTF_TO_IMPL(qname_list_attr);
-    return (axis2_array_list_t *) AXIS2_WODEN_XML_ATTR_GET_CONTENT(
+    return (axis2_array_list_t *) WODEN_XML_ATTR_GET_CONTENT(
             qname_list_attr_impl->xml_attr, env);
 }
 
 void *AXIS2_CALL
-axis2_woden_qname_list_attr_convert(
+woden_qname_list_attr_convert(
         void *qname_list_attr,
         const axis2_env_t *env,
         axiom_element_t *owner_el,
         axiom_node_t *owner_node,
         axis2_char_t *attr_value)
 {
-    axis2_woden_qname_list_attr_impl_t *qname_list_attr_impl = NULL;
+    woden_qname_list_attr_impl_t *qname_list_attr_impl = NULL;
     axis2_qname_t *qn = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -241,7 +241,7 @@
     
     if(!qn)
     {
-        AXIS2_WODEN_XML_ATTR_SET_VALID(qname_list_attr_impl->xml_attr, env, AXIS2_FALSE);
+        WODEN_XML_ATTR_SET_VALID(qname_list_attr_impl->xml_attr, env, AXIS2_FALSE);
         /* TODO handler error */
     }
     

Modified: webservices/axis2/trunk/c/woden/src/xml/qname_list_or_token_any_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/qname_list_or_token_any_attr.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/qname_list_or_token_any_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/qname_list_or_token_any_attr.c Tue Jun 13 22:23:14 2006
@@ -14,68 +14,68 @@
  * limitations under the License.
  */
 
-#include <woden/xml/axis2_woden_qname_list_or_token_any_attr.h>
-#include <woden/xml/axis2_woden_xml_attr.h>
+#include <woden_qname_list_or_token_any_attr.h>
+#include <woden_xml_attr.h>
 #include <axiom_element.h>
 #include <axiom_node.h>
 
-typedef struct axis2_woden_qname_list_or_token_any_attr_impl 
-        axis2_woden_qname_list_or_token_any_attr_impl_t;
+typedef struct woden_qname_list_or_token_any_attr_impl 
+        woden_qname_list_or_token_any_attr_impl_t;
 
 /** 
  * @brief QName List or Token Any Attribute Struct Impl
  *   Axis2 QName List or Token Any Attribute  
  */ 
-struct axis2_woden_qname_list_or_token_any_attr_impl
+struct woden_qname_list_or_token_any_attr_impl
 {
-    axis2_woden_qname_list_or_token_any_attr_t list_token_attr;
-    axis2_woden_xml_attr_t *xml_attr;
-    axis2_woden_obj_types_t obj_type;
+    woden_qname_list_or_token_any_attr_t list_token_attr;
+    woden_xml_attr_t *xml_attr;
+    woden_obj_types_t obj_type;
     axis2_hash_t *methods;
     axis2_bool_t is_token;
 };
 
 #define INTF_TO_IMPL(list_token_attr) \
-    ((axis2_woden_qname_list_or_token_any_attr_impl_t *) \
+    ((woden_qname_list_or_token_any_attr_impl_t *) \
      list_token_attr)
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_qname_list_or_token_any_attr_free(
+woden_qname_list_or_token_any_attr_free(
        void *list_token_attr,
        const axis2_env_t *env);
 
-axis2_woden_obj_types_t AXIS2_CALL 
-axis2_woden_qname_list_or_token_any_attr_type(
+woden_obj_types_t AXIS2_CALL 
+woden_qname_list_or_token_any_attr_type(
        void *list_token_attr,
        const axis2_env_t *env);
 
-axis2_woden_xml_attr_t *AXIS2_CALL
-axis2_woden_qname_list_or_token_any_attr_get_base_impl(
+woden_xml_attr_t *AXIS2_CALL
+woden_qname_list_or_token_any_attr_get_base_impl(
        void *list_token_attr,
        const axis2_env_t *env);
 
 axis2_bool_t AXIS2_CALL
-axis2_woden_qname_list_or_token_any_attr_is_qname_list(
+woden_qname_list_or_token_any_attr_is_qname_list(
        void *list_token_attr,
        const axis2_env_t *env); 
 
 axis2_bool_t AXIS2_CALL
-axis2_woden_qname_list_or_token_any_attr_is_token(
+woden_qname_list_or_token_any_attr_is_token(
        void *list_token_attr,
        const axis2_env_t *env);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_qname_list_or_token_any_attr_get_qnames(
+woden_qname_list_or_token_any_attr_get_qnames(
        void *list_token_attr,
        const axis2_env_t *env);
 
 axis2_char_t *AXIS2_CALL
-axis2_woden_qname_list_or_token_any_attr_get_token(
+woden_qname_list_or_token_any_attr_get_token(
        void *list_token_attr,
        const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_qname_list_or_token_any_attr_convert(
+woden_qname_list_or_token_any_attr_convert(
        void *list_token_attr,
        const axis2_env_t *env,
        axiom_element_t *owner_el,
@@ -86,44 +86,44 @@
  * TODO This constructor is not used for extension attributes, but may be useful if
  * parsing of native WSDL attributes is changed to use the XMLAttr interface.
  */
-AXIS2_EXTERN axis2_woden_qname_list_or_token_any_attr_t * AXIS2_CALL
-axis2_woden_qname_list_or_token_any_attr_create(
+AXIS2_EXTERN woden_qname_list_or_token_any_attr_t * AXIS2_CALL
+woden_qname_list_or_token_any_attr_create(
        const axis2_env_t *env,
        axiom_element_t *owner_el,
        axiom_node_t *owner_node,
        axis2_qname_t *attr_type,
        axis2_char_t *attr_value)
 {
-    axis2_woden_qname_list_or_token_any_attr_impl_t *
+    woden_qname_list_or_token_any_attr_impl_t *
             list_token_attr_impl = NULL;
      
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     list_token_attr_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_woden_qname_list_or_token_any_attr_impl_t));
+                    sizeof(woden_qname_list_or_token_any_attr_impl_t));
 
-    list_token_attr_impl->obj_type = AXIS2_WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR;
+    list_token_attr_impl->obj_type = WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR;
     list_token_attr_impl->xml_attr = NULL;
     list_token_attr_impl->methods = NULL;
     list_token_attr_impl->list_token_attr.ops = 
         AXIS2_MALLOC(env->allocator, 
-                sizeof(axis2_woden_qname_list_or_token_any_attr_ops_t));
+                sizeof(woden_qname_list_or_token_any_attr_ops_t));
 
     list_token_attr_impl->list_token_attr.ops->free = 
-        axis2_woden_qname_list_or_token_any_attr_free;
+        woden_qname_list_or_token_any_attr_free;
     list_token_attr_impl->list_token_attr.ops->type = 
-        axis2_woden_qname_list_or_token_any_attr_type;
+        woden_qname_list_or_token_any_attr_type;
     list_token_attr_impl->list_token_attr.ops->get_base_impl = 
-        axis2_woden_qname_list_or_token_any_attr_get_base_impl;
+        woden_qname_list_or_token_any_attr_get_base_impl;
     list_token_attr_impl->list_token_attr.ops->is_qname_list = 
-        axis2_woden_qname_list_or_token_any_attr_is_qname_list;
+        woden_qname_list_or_token_any_attr_is_qname_list;
     list_token_attr_impl->list_token_attr.ops->is_token = 
-        axis2_woden_qname_list_or_token_any_attr_is_token;
+        woden_qname_list_or_token_any_attr_is_token;
     list_token_attr_impl->list_token_attr.ops->get_qnames = 
-        axis2_woden_qname_list_or_token_any_attr_get_qnames;
+        woden_qname_list_or_token_any_attr_get_qnames;
     list_token_attr_impl->list_token_attr.ops->get_token = 
-        axis2_woden_qname_list_or_token_any_attr_get_token;
+        woden_qname_list_or_token_any_attr_get_token;
     list_token_attr_impl->list_token_attr.ops->convert = 
-        axis2_woden_qname_list_or_token_any_attr_convert;
+        woden_qname_list_or_token_any_attr_convert;
     
     
     list_token_attr_impl->methods = axis2_hash_make(env);
@@ -133,37 +133,37 @@
         return NULL;
     }
     axis2_hash_set(list_token_attr_impl->methods, "free", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_qname_list_or_token_any_attr_free);
+            AXIS2_HASH_KEY_STRING, woden_qname_list_or_token_any_attr_free);
     axis2_hash_set(list_token_attr_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_qname_list_or_token_any_attr_type);
+            AXIS2_HASH_KEY_STRING, woden_qname_list_or_token_any_attr_type);
     axis2_hash_set(list_token_attr_impl->methods, "is_qname_list", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_qname_list_or_token_any_attr_is_qname_list);
+            woden_qname_list_or_token_any_attr_is_qname_list);
     axis2_hash_set(list_token_attr_impl->methods, "is_token", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_qname_list_or_token_any_attr_is_token);
+            woden_qname_list_or_token_any_attr_is_token);
     axis2_hash_set(list_token_attr_impl->methods, "get_qnames", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_qname_list_or_token_any_attr_get_qnames);
+            woden_qname_list_or_token_any_attr_get_qnames);
     axis2_hash_set(list_token_attr_impl->methods, "get_token", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_qname_list_or_token_any_attr_get_token);
+            woden_qname_list_or_token_any_attr_get_token);
     axis2_hash_set(list_token_attr_impl->methods, "convert", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_qname_list_or_token_any_attr_convert);
+            woden_qname_list_or_token_any_attr_convert);
 
-    list_token_attr_impl->xml_attr = axis2_woden_xml_attr_create(
+    list_token_attr_impl->xml_attr = woden_xml_attr_create(
             env, owner_el, owner_node, attr_type, attr_value);
     
     return &(list_token_attr_impl->list_token_attr);
 }
 
-axis2_woden_obj_types_t AXIS2_CALL
-axis2_woden_qname_list_or_token_any_attr_type(
+woden_obj_types_t AXIS2_CALL
+woden_qname_list_or_token_any_attr_type(
         void *list_token_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_list_or_token_any_attr_impl_t *
+    woden_qname_list_or_token_any_attr_impl_t *
             list_token_attr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -173,11 +173,11 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_qname_list_or_token_any_attr_free(
+woden_qname_list_or_token_any_attr_free(
         void *list_token_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_list_or_token_any_attr_impl_t *
+    woden_qname_list_or_token_any_attr_impl_t *
             list_token_attr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -191,7 +191,7 @@
 
     if(list_token_attr_impl->xml_attr)
     {
-        AXIS2_WODEN_XML_ATTR_FREE(list_token_attr_impl->xml_attr, 
+        WODEN_XML_ATTR_FREE(list_token_attr_impl->xml_attr, 
                 env);
         list_token_attr_impl->xml_attr = NULL;
     }
@@ -212,12 +212,12 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_woden_xml_attr_t *AXIS2_CALL
-axis2_woden_qname_list_or_token_any_attr_get_base_impl(
+woden_xml_attr_t *AXIS2_CALL
+woden_qname_list_or_token_any_attr_get_base_impl(
         void *list_token_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_list_or_token_any_attr_impl_t *
+    woden_qname_list_or_token_any_attr_impl_t *
             list_token_attr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
@@ -228,8 +228,8 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_qname_list_or_token_any_attr_resolve_methods(
-        axis2_woden_qname_list_or_token_any_attr_t *list_token_attr,
+woden_qname_list_or_token_any_attr_resolve_methods(
+        woden_qname_list_or_token_any_attr_t *list_token_attr,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {
@@ -259,18 +259,18 @@
 }
 
 axis2_bool_t AXIS2_CALL
-axis2_woden_qname_list_or_token_any_attr_is_qname_list(
+woden_qname_list_or_token_any_attr_is_qname_list(
         void *list_token_attr,
         const axis2_env_t *env) 
 {
-    axis2_woden_qname_list_or_token_any_attr_impl_t *
+    woden_qname_list_or_token_any_attr_impl_t *
             list_token_attr_impl = NULL;
     axis2_generic_obj_t *content = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     list_token_attr_impl = INTF_TO_IMPL(list_token_attr);
 
-    content = AXIS2_WODEN_XML_ATTR_GET_CONTENT(list_token_attr_impl->xml_attr, 
+    content = WODEN_XML_ATTR_GET_CONTENT(list_token_attr_impl->xml_attr, 
             env);
     if(AXIS2_QNAME_LIST == AXIS2_GENERIC_OBJ_GET_TYPE(content, env))
         return AXIS2_TRUE;
@@ -278,19 +278,19 @@
 }
 
 axis2_bool_t AXIS2_CALL
-axis2_woden_qname_list_or_token_any_attr_is_token(
+woden_qname_list_or_token_any_attr_is_token(
         void *list_token_attr,
         const axis2_env_t *env) 
 {
-    axis2_woden_qname_list_or_token_any_attr_impl_t *
+    woden_qname_list_or_token_any_attr_impl_t *
             list_token_attr_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     list_token_attr_impl = INTF_TO_IMPL(list_token_attr);
 
-    if(AXIS2_TRUE != axis2_woden_qname_list_or_token_any_attr_is_qname_list(
+    if(AXIS2_TRUE != woden_qname_list_or_token_any_attr_is_qname_list(
                 list_token_attr, env) && AXIS2_TRUE == 
-            AXIS2_WODEN_XML_ATTR_IS_VALID(list_token_attr_impl->xml_attr, env))
+            WODEN_XML_ATTR_IS_VALID(list_token_attr_impl->xml_attr, env))
     {
         return AXIS2_TRUE;
     } else 
@@ -300,34 +300,34 @@
 }
 
 axis2_array_list_t *AXIS2_CALL
-axis2_woden_qname_list_or_token_any_attr_get_qnames(
+woden_qname_list_or_token_any_attr_get_qnames(
         void *list_token_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_list_or_token_any_attr_impl_t *
+    woden_qname_list_or_token_any_attr_impl_t *
             list_token_attr_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     list_token_attr_impl = INTF_TO_IMPL(list_token_attr);
-    return (axis2_array_list_t *) AXIS2_WODEN_XML_ATTR_GET_CONTENT(
+    return (axis2_array_list_t *) WODEN_XML_ATTR_GET_CONTENT(
             list_token_attr_impl->xml_attr, env);
 }
 
 axis2_char_t *AXIS2_CALL
-axis2_woden_qname_list_or_token_any_attr_get_token(
+woden_qname_list_or_token_any_attr_get_token(
         void *list_token_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_list_or_token_any_attr_impl_t *
+    woden_qname_list_or_token_any_attr_impl_t *
             list_token_attr_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     list_token_attr_impl = INTF_TO_IMPL(list_token_attr);
     if(AXIS2_TRUE == 
-            axis2_woden_qname_list_or_token_any_attr_is_token(list_token_attr, 
+            woden_qname_list_or_token_any_attr_is_token(list_token_attr, 
                 env))
     {
-        return (axis2_char_t *) AXIS2_WODEN_XML_ATTR_GET_CONTENT(
+        return (axis2_char_t *) WODEN_XML_ATTR_GET_CONTENT(
                 list_token_attr_impl->xml_attr, env);
     } else 
     {
@@ -336,14 +336,14 @@
 }
 
 void *AXIS2_CALL
-axis2_woden_qname_list_or_token_any_attr_convert(
+woden_qname_list_or_token_any_attr_convert(
         void *list_token_attr,
         const axis2_env_t *env,
         axiom_element_t *owner_el,
         axiom_node_t *owner_node,
         axis2_char_t *attr_value)
 {
-    axis2_woden_qname_list_or_token_any_attr_impl_t *
+    woden_qname_list_or_token_any_attr_impl_t *
             list_token_attr_impl = NULL;
     axis2_array_list_t *qn_array = NULL;
     
@@ -361,7 +361,7 @@
     
     if(!qn_array)
     {
-        AXIS2_WODEN_XML_ATTR_SET_VALID(list_token_attr_impl->
+        WODEN_XML_ATTR_SET_VALID(list_token_attr_impl->
                 xml_attr, env, AXIS2_FALSE);
         /* TODO handler error */
     }

Modified: webservices/axis2/trunk/c/woden/src/xml/qname_or_token_any_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/qname_or_token_any_attr.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/qname_or_token_any_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/qname_or_token_any_attr.c Tue Jun 13 22:23:14 2006
@@ -14,67 +14,67 @@
  * limitations under the License.
  */
 
-#include <woden/xml/axis2_woden_qname_or_token_any_attr.h>
-#include <woden/xml/axis2_woden_xml_attr.h>
+#include <woden_qname_or_token_any_attr.h>
+#include <woden_xml_attr.h>
 #include <axiom_element.h>
 #include <axiom_node.h>
 
-typedef struct axis2_woden_qname_or_token_any_attr_impl 
-        axis2_woden_qname_or_token_any_attr_impl_t;
+typedef struct woden_qname_or_token_any_attr_impl 
+        woden_qname_or_token_any_attr_impl_t;
 
 /** 
  * @brief QName or Token Any Attribute Struct Impl
  *   Axis2 QName or Token Any Attribute  
  */ 
-struct axis2_woden_qname_or_token_any_attr_impl
+struct woden_qname_or_token_any_attr_impl
 {
-    axis2_woden_qname_or_token_any_attr_t token_attr;
-    axis2_woden_xml_attr_t *xml_attr;
-    axis2_woden_obj_types_t obj_type;
+    woden_qname_or_token_any_attr_t token_attr;
+    woden_xml_attr_t *xml_attr;
+    woden_obj_types_t obj_type;
     axis2_hash_t *methods;
 };
 
 #define INTF_TO_IMPL(token_attr) \
-    ((axis2_woden_qname_or_token_any_attr_impl_t *) \
+    ((woden_qname_or_token_any_attr_impl_t *) \
      token_attr)
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_qname_or_token_any_attr_free(
+woden_qname_or_token_any_attr_free(
         void *token_attr,
         const axis2_env_t *env);
 
-axis2_woden_obj_types_t AXIS2_CALL 
-axis2_woden_qname_or_token_any_attr_type(
+woden_obj_types_t AXIS2_CALL 
+woden_qname_or_token_any_attr_type(
         void *token_attr,
         const axis2_env_t *env);
 
-axis2_woden_xml_attr_t *AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_get_base_impl(
+woden_xml_attr_t *AXIS2_CALL
+woden_qname_or_token_any_attr_get_base_impl(
         void *token_attr,
         const axis2_env_t *env);
 
 axis2_bool_t AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_is_qname(
+woden_qname_or_token_any_attr_is_qname(
         void *token_attr,
         const axis2_env_t *env); 
 
 axis2_bool_t AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_is_token(
+woden_qname_or_token_any_attr_is_token(
         void *token_attr,
         const axis2_env_t *env);
 
 axis2_qname_t *AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_get_qname(
+woden_qname_or_token_any_attr_get_qname(
         void *token_attr,
         const axis2_env_t *env);
 
 axis2_char_t *AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_get_token(
+woden_qname_or_token_any_attr_get_token(
         void *token_attr,
         const axis2_env_t *env);
 
 void *AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_convert(
+woden_qname_or_token_any_attr_convert(
         void *token_attr,
         const axis2_env_t *env,
         axiom_element_t *owner_el,
@@ -85,45 +85,45 @@
  * TODO This constructor is not used for extension attributes, but may be useful if
  * parsing of native WSDL attributes is changed to use the XMLAttr interface.
  */
-AXIS2_EXTERN axis2_woden_qname_or_token_any_attr_t * AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_create(const axis2_env_t *env,
+AXIS2_EXTERN woden_qname_or_token_any_attr_t * AXIS2_CALL
+woden_qname_or_token_any_attr_create(const axis2_env_t *env,
         axiom_element_t *owner_el,
         axiom_node_t *owner_node,
         axis2_qname_t *attr_type,
         axis2_char_t *attr_value)
 {
-    axis2_woden_qname_or_token_any_attr_impl_t *
+    woden_qname_or_token_any_attr_impl_t *
             token_attr_impl = NULL;
      
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     token_attr_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_woden_qname_or_token_any_attr_impl_t));
+                    sizeof(woden_qname_or_token_any_attr_impl_t));
 
-    token_attr_impl->obj_type = AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR;
+    token_attr_impl->obj_type = WODEN_QNAME_OR_TOKEN_ANY_ATTR;
     token_attr_impl->xml_attr = NULL;
     token_attr_impl->methods = NULL;
 
     token_attr_impl->token_attr.ops = 
         AXIS2_MALLOC(env->allocator, 
-                sizeof(axis2_woden_qname_or_token_any_attr_ops_t));
+                sizeof(woden_qname_or_token_any_attr_ops_t));
 
     token_attr_impl->token_attr.ops->free = 
-        axis2_woden_qname_or_token_any_attr_free;
+        woden_qname_or_token_any_attr_free;
     token_attr_impl->token_attr.ops->type = 
-        axis2_woden_qname_or_token_any_attr_type;
+        woden_qname_or_token_any_attr_type;
     token_attr_impl->token_attr.ops->get_base_impl = 
-        axis2_woden_qname_or_token_any_attr_get_base_impl;
+        woden_qname_or_token_any_attr_get_base_impl;
 
     token_attr_impl->token_attr.ops->is_qname = 
-        axis2_woden_qname_or_token_any_attr_is_qname;
+        woden_qname_or_token_any_attr_is_qname;
     token_attr_impl->token_attr.ops->is_token = 
-        axis2_woden_qname_or_token_any_attr_is_token;
+        woden_qname_or_token_any_attr_is_token;
     token_attr_impl->token_attr.ops->get_qname = 
-        axis2_woden_qname_or_token_any_attr_get_qname;
+        woden_qname_or_token_any_attr_get_qname;
     token_attr_impl->token_attr.ops->get_token = 
-        axis2_woden_qname_or_token_any_attr_get_token;
+        woden_qname_or_token_any_attr_get_token;
     token_attr_impl->token_attr.ops->convert = 
-        axis2_woden_qname_or_token_any_attr_convert;
+        woden_qname_or_token_any_attr_convert;
     
     
     token_attr_impl->methods = axis2_hash_make(env);
@@ -133,38 +133,38 @@
         return NULL;
     }
     axis2_hash_set(token_attr_impl->methods, "free", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_qname_or_token_any_attr_free);
+            AXIS2_HASH_KEY_STRING, woden_qname_or_token_any_attr_free);
     axis2_hash_set(token_attr_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_qname_or_token_any_attr_type);
+            AXIS2_HASH_KEY_STRING, woden_qname_or_token_any_attr_type);
 
     axis2_hash_set(token_attr_impl->methods, "is_qname", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_qname_or_token_any_attr_is_qname);
+            woden_qname_or_token_any_attr_is_qname);
     axis2_hash_set(token_attr_impl->methods, "is_token", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_qname_or_token_any_attr_is_token);
+            woden_qname_or_token_any_attr_is_token);
     axis2_hash_set(token_attr_impl->methods, "get_qname", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_qname_or_token_any_attr_get_qname);
+            woden_qname_or_token_any_attr_get_qname);
     axis2_hash_set(token_attr_impl->methods, "get_token", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_qname_or_token_any_attr_get_token);
+            woden_qname_or_token_any_attr_get_token);
     axis2_hash_set(token_attr_impl->methods, "convert", 
             AXIS2_HASH_KEY_STRING, 
-            axis2_woden_qname_or_token_any_attr_convert);
+            woden_qname_or_token_any_attr_convert);
 
-    token_attr_impl->xml_attr = axis2_woden_xml_attr_create(
+    token_attr_impl->xml_attr = woden_xml_attr_create(
             env, owner_el, owner_node, attr_type, attr_value);
     
     return &(token_attr_impl->token_attr);
 }
 
-axis2_woden_obj_types_t AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_type(
+woden_obj_types_t AXIS2_CALL
+woden_qname_or_token_any_attr_type(
         void *token_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_or_token_any_attr_impl_t *
+    woden_qname_or_token_any_attr_impl_t *
             token_attr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -174,11 +174,11 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_free(
+woden_qname_or_token_any_attr_free(
         void *token_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_or_token_any_attr_impl_t *
+    woden_qname_or_token_any_attr_impl_t *
             token_attr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -192,7 +192,7 @@
 
     if(token_attr_impl->xml_attr)
     {
-        AXIS2_WODEN_XML_ATTR_FREE(token_attr_impl->xml_attr, 
+        WODEN_XML_ATTR_FREE(token_attr_impl->xml_attr, 
                 env);
         token_attr_impl->xml_attr = NULL;
     }
@@ -213,12 +213,12 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_woden_xml_attr_t *AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_get_base_impl(
+woden_xml_attr_t *AXIS2_CALL
+woden_qname_or_token_any_attr_get_base_impl(
         void *token_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_or_token_any_attr_impl_t *
+    woden_qname_or_token_any_attr_impl_t *
             token_attr_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
@@ -229,8 +229,8 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_resolve_methods(
-        axis2_woden_qname_or_token_any_attr_t *
+woden_qname_or_token_any_attr_resolve_methods(
+        woden_qname_or_token_any_attr_t *
         token_attr,
         const axis2_env_t *env,
         axis2_hash_t *methods)
@@ -258,11 +258,11 @@
 }
 
 axis2_bool_t AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_is_qname(
+woden_qname_or_token_any_attr_is_qname(
         void *token_attr,
         const axis2_env_t *env) 
 {
-    axis2_woden_qname_or_token_any_attr_impl_t *
+    woden_qname_or_token_any_attr_impl_t *
             token_attr_impl = NULL;
     axis2_generic_obj_t *content = NULL;
     
@@ -271,28 +271,28 @@
     /* TODO Check this. We need to check whether the
      * f_content is an instance of qname
      */
-    if(AXIS2_FALSE == axis2_woden_qname_or_token_any_attr_is_token(token_attr, 
+    if(AXIS2_FALSE == woden_qname_or_token_any_attr_is_token(token_attr, 
                 env))
         return AXIS2_TRUE;
-    content = AXIS2_WODEN_XML_ATTR_GET_CONTENT(token_attr_impl->xml_attr, env);
+    content = WODEN_XML_ATTR_GET_CONTENT(token_attr_impl->xml_attr, env);
     if(AXIS2_QNAME == AXIS2_GENERIC_OBJ_GET_TYPE(content, env))
         return AXIS2_TRUE;
     return AXIS2_FALSE;
 }
 
 axis2_bool_t AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_is_token(
+woden_qname_or_token_any_attr_is_token(
         void *token_attr,
         const axis2_env_t *env) 
 {
-    axis2_woden_qname_or_token_any_attr_impl_t *
+    woden_qname_or_token_any_attr_impl_t *
             token_attr_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     token_attr_impl = INTF_TO_IMPL(token_attr);
 
-    if(AXIS2_TRUE != axis2_woden_qname_or_token_any_attr_is_qname(token_attr, 
-                env) && AXIS2_TRUE == AXIS2_WODEN_XML_ATTR_IS_VALID(
+    if(AXIS2_TRUE != woden_qname_or_token_any_attr_is_qname(token_attr, 
+                env) && AXIS2_TRUE == WODEN_XML_ATTR_IS_VALID(
                     token_attr_impl->xml_attr, env))
     {
         return AXIS2_TRUE;
@@ -303,39 +303,39 @@
 }
 
 axis2_qname_t *AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_get_qname(
+woden_qname_or_token_any_attr_get_qname(
         void *token_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_or_token_any_attr_impl_t *
+    woden_qname_or_token_any_attr_impl_t *
             token_attr_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     token_attr_impl = INTF_TO_IMPL(token_attr);
 
-    if(AXIS2_TRUE == axis2_woden_qname_or_token_any_attr_is_qname(token_attr, 
+    if(AXIS2_TRUE == woden_qname_or_token_any_attr_is_qname(token_attr, 
                 env))
-        return (axis2_qname_t *) AXIS2_WODEN_XML_ATTR_GET_CONTENT(
+        return (axis2_qname_t *) WODEN_XML_ATTR_GET_CONTENT(
                 token_attr_impl->xml_attr, env);
     else
         return NULL;
 }
 
 axis2_char_t *AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_get_token(
+woden_qname_or_token_any_attr_get_token(
         void *token_attr,
         const axis2_env_t *env)
 {
-    axis2_woden_qname_or_token_any_attr_impl_t *
+    woden_qname_or_token_any_attr_impl_t *
             token_attr_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     token_attr_impl = INTF_TO_IMPL(token_attr);
-    if(AXIS2_TRUE == axis2_woden_qname_or_token_any_attr_is_qname(token_attr, 
-                env) && AXIS2_TRUE == AXIS2_WODEN_XML_ATTR_IS_VALID(
+    if(AXIS2_TRUE == woden_qname_or_token_any_attr_is_qname(token_attr, 
+                env) && AXIS2_TRUE == WODEN_XML_ATTR_IS_VALID(
                     token_attr_impl->xml_attr, env) )
     {
-        return (axis2_char_t *) AXIS2_WODEN_XML_ATTR_GET_CONTENT(
+        return (axis2_char_t *) WODEN_XML_ATTR_GET_CONTENT(
                 token_attr_impl->xml_attr, env);
     } else 
     {
@@ -344,14 +344,14 @@
 }
 
 void *AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_convert(
+woden_qname_or_token_any_attr_convert(
         void *token_attr,
         const axis2_env_t *env,
         axiom_element_t *owner_el,
         axiom_node_t *owner_node,
         axis2_char_t *attr_value)
 {
-    axis2_woden_qname_or_token_any_attr_impl_t *
+    woden_qname_or_token_any_attr_impl_t *
             token_attr_impl = NULL;
     axis2_qname_t *qn = NULL;
     
@@ -369,7 +369,7 @@
     
     if(!qn)
     {
-        AXIS2_WODEN_XML_ATTR_SET_VALID(token_attr_impl->
+        WODEN_XML_ATTR_SET_VALID(token_attr_impl->
                 xml_attr, env, AXIS2_FALSE);
         /* TODO handler error */
     }



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