axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r414079 [5/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/
Date Wed, 14 Jun 2006 05:23:21 GMT
Modified: webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref_element.h?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref_element.h Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_H
-#define AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_H
+#ifndef WODEN_INTERFACE_MSG_REF_ELEMENT_H
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_H
 
 /**
- * @file axis2_woden_interface_msg_ref_element.h
+ * @file woden_interface_msg_ref_element.h
  * @brief Axis2 Interface Msg Reference Element Interface
  * This interface represents the <input> and <output> 
  * child elements of interface operation. 
@@ -33,26 +33,26 @@
 #include <axis2_qname.h>
 #include <axis2_uri.h>
 #include <axis2_array_list.h>
-#include <woden/axis2_woden.h>
-#include <woden/wsdl20/xml/axis2_woden_documentable_element.h>
-#include <woden/wsdl20/xml/axis2_woden_configurable_element.h>
-#include <woden/wsdl20/xml/axis2_woden_nested_element.h>
+#include <woden/woden.h>
+#include <woden_documentable_element.h>
+#include <woden_configurable_element.h>
+#include <woden_nested_element.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-typedef struct axis2_woden_interface_msg_ref_element axis2_woden_interface_msg_ref_element_t;
-typedef struct axis2_woden_interface_msg_ref_element_ops axis2_woden_interface_msg_ref_element_ops_t;
-typedef union axis2_woden_interface_msg_ref_element_base axis2_woden_interface_msg_ref_element_base_t;
+typedef struct woden_interface_msg_ref_element woden_interface_msg_ref_element_t;
+typedef struct woden_interface_msg_ref_element_ops woden_interface_msg_ref_element_ops_t;
+typedef union woden_interface_msg_ref_element_base woden_interface_msg_ref_element_base_t;
 
-/** @defgroup axis2_woden_interface_msg_ref_element Interface Msg Reference Element
+/** @defgroup woden_interface_msg_ref_element Interface Msg Reference Element
   * @ingroup axis2_interface
   * @{
   */
 
-struct axis2_woden_interface_msg_ref_element_ops
+struct woden_interface_msg_ref_element_ops
 {
    /** 
      * Deallocate memory
@@ -63,7 +63,7 @@
             void *interface_msg_ref_element,
             const axis2_env_t *env);
  
-    axis2_woden_obj_types_t (AXIS2_CALL *
+    woden_obj_types_t (AXIS2_CALL *
     type) (
             void *interface_msg_ref_element,
             const axis2_env_t *env);
@@ -137,73 +137,73 @@
 
 };
 
-union axis2_woden_interface_msg_ref_element_base
+union woden_interface_msg_ref_element_base
 {
-    axis2_woden_documentable_element_t documentable_element;
-    axis2_woden_configurable_element_t configurable_element;
-    axis2_woden_nested_element_t nested_element;
+    woden_documentable_element_t documentable_element;
+    woden_configurable_element_t configurable_element;
+    woden_nested_element_t nested_element;
 };
 
-struct axis2_woden_interface_msg_ref_element
+struct woden_interface_msg_ref_element
 {
-    axis2_woden_interface_msg_ref_element_base_t base;
-    axis2_woden_interface_msg_ref_element_ops_t *ops;
+    woden_interface_msg_ref_element_base_t base;
+    woden_interface_msg_ref_element_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_woden_interface_msg_ref_element_t * AXIS2_CALL
-axis2_woden_interface_msg_ref_element_create(
+AXIS2_EXTERN woden_interface_msg_ref_element_t * AXIS2_CALL
+woden_interface_msg_ref_element_create(
         const axis2_env_t *env);
 
 /************************Woden C Internal Methods******************************/
 AXIS2_EXTERN 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);
 /************************End of Woden C Internal Methods***********************/
 
-#define AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_FREE(interface_msg_ref_element, env) \
-      (((axis2_woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_FREE(interface_msg_ref_element, env) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
          free (interface_msg_ref_element, env))
 
-#define AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_TYPE(interface_msg_ref_element, env) \
-      (((axis2_woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_TYPE(interface_msg_ref_element, env) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
          type (interface_msg_ref_element, env))
 
-#define AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_SET_MSG_LABEL(interface_msg_ref_element, env, msg_label) \
-      (((axis2_woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_SET_MSG_LABEL(interface_msg_ref_element, env, msg_label) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
          set_msg_label (interface_msg_ref_element, env, msg_label))
 
-#define AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_GET_MSG_LABEL(interface_msg_ref_element, env) \
-      (((axis2_woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_GET_MSG_LABEL(interface_msg_ref_element, env) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
         get_msg_label  (interface_msg_ref_element, env))
 
-#define AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_SET_MSG_CONTENT_MODEL(interface_msg_ref_element, env, nm_token) \
-      (((axis2_woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_SET_MSG_CONTENT_MODEL(interface_msg_ref_element, env, nm_token) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
          set_msg_content_model (interface_msg_ref_element, env, nm_token))
 
-#define AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_GET_MSG_CONTENT_MODEL(interface_msg_ref_element, env) \
-      (((axis2_woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_GET_MSG_CONTENT_MODEL(interface_msg_ref_element, env) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
          get_msg_content_model (interface_msg_ref_element, env))
 
-#define AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_SET_ELEMENT_QNAME(interface_msg_ref_element, env, element) \
-      (((axis2_woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_SET_ELEMENT_QNAME(interface_msg_ref_element, env, element) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
         set_element_qname  (interface_msg_ref_element, env, element))
 
-#define AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_GET_ELEMENT_QNAME(interface_msg_ref_element, env) \
-      (((axis2_woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_GET_ELEMENT_QNAME(interface_msg_ref_element, env) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
         get_element_qname  (interface_msg_ref_element, env))
 
-#define AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_GET_ELEMENT(interface_msg_ref_element, env) \
-      (((axis2_woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_GET_ELEMENT(interface_msg_ref_element, env) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
         get_element  (interface_msg_ref_element, env))
 
-#define AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_SET_DIRECTION(interface_msg_ref_element, env, dir) \
-      (((axis2_woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_SET_DIRECTION(interface_msg_ref_element, env, dir) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
          set_direction (interface_msg_ref_element, env, dir))
 
-#define AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_GET_DIRECTION(interface_msg_ref_element, env) \
-      (((axis2_woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_GET_DIRECTION(interface_msg_ref_element, env) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
          get_direction (interface_msg_ref_element, env))
 
 
@@ -213,4 +213,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_H */
+#endif /* WODEN_INTERFACE_MSG_REF_ELEMENT_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_interface_op.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_op.h?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_op.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_op.h Tue Jun 13 22:23:14 2006
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_WODEN_INTERFACE_OP_H
-#define AXIS2_WODEN_INTERFACE_OP_H
+#ifndef WODEN_INTERFACE_OP_H
+#define WODEN_INTERFACE_OP_H
 
 /**
- * @file axis2_woden_interface_op.h
+ * @file woden_interface_op.h
  * @brief Axis2 Interface Operation Interface Operation
  * 
  */
 
-#include <woden/axis2_woden.h>
-#include <woden/wsdl20/xml/axis2_woden_interface_op_element.h>
-#include <woden/wsdl20/axis2_woden_nested_configurable.h>
+#include <woden/woden.h>
+#include <woden_interface_op_element.h>
+#include <woden_nested_configurable.h>
 #include <axis2_qname.h>
 
-/** @defgroup axis2_woden_interface_op Interface Operation
+/** @defgroup woden_interface_op Interface Operation
   * @ingroup axis2_wsdl
   * @{
   */
 
-typedef union axis2_woden_interface_op_base axis2_woden_interface_op_base_t;
-typedef struct axis2_woden_interface_op axis2_woden_interface_op_t;
-typedef struct axis2_woden_interface_op_ops axis2_woden_interface_op_ops_t;
+typedef union woden_interface_op_base woden_interface_op_base_t;
+typedef struct woden_interface_op woden_interface_op_t;
+typedef struct woden_interface_op_ops woden_interface_op_ops_t;
 
 
 #ifdef __cplusplus
@@ -43,7 +43,7 @@
 {
 #endif
 
-struct axis2_woden_interface_op_ops
+struct woden_interface_op_ops
 {
    /** 
      * Deallocate memory
@@ -57,13 +57,13 @@
     super_objs) (void *interface_op,
             const axis2_env_t *env);
 
-    axis2_woden_obj_types_t (AXIS2_CALL *
+    woden_obj_types_t (AXIS2_CALL *
     type) (void *interface_op,
             const axis2_env_t *env);
     /**
      * @return the base implementation class
      */
-    struct axis2_woden_nested_configurable *(AXIS2_CALL *
+    struct woden_nested_configurable *(AXIS2_CALL *
     get_base_impl) (
             void *interface_op,
             const axis2_env_t *env);
@@ -100,116 +100,116 @@
 
 };
 
-union axis2_woden_interface_op_base
+union woden_interface_op_base
 {
-    axis2_woden_nested_configurable_t nested_configurable;
-    axis2_woden_interface_op_element_t interface_op_element;
+    woden_nested_configurable_t nested_configurable;
+    woden_interface_op_element_t interface_op_element;
 };
 
-struct axis2_woden_interface_op
+struct woden_interface_op
 {
-    axis2_woden_interface_op_base_t base;
-    axis2_woden_interface_op_ops_t *ops;
+    woden_interface_op_base_t base;
+    woden_interface_op_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_woden_interface_op_t * AXIS2_CALL
-axis2_woden_interface_op_create(
+AXIS2_EXTERN woden_interface_op_t * AXIS2_CALL
+woden_interface_op_create(
         const axis2_env_t *env);
 
 
 /***************************Woden C Internal Methods***************************/
-AXIS2_EXTERN axis2_woden_interface_op_t * AXIS2_CALL
-axis2_woden_interface_op_to_interface_op_element(
+AXIS2_EXTERN woden_interface_op_t * AXIS2_CALL
+woden_interface_op_to_interface_op_element(
         void *interface_op,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_interface_op_t * AXIS2_CALL
-axis2_woden_interface_op_to_nested_configurable(
+AXIS2_EXTERN woden_interface_op_t * AXIS2_CALL
+woden_interface_op_to_nested_configurable(
         void *interface_op,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_interface_op_t * AXIS2_CALL
-axis2_woden_interface_op_to_configurable(
+AXIS2_EXTERN woden_interface_op_t * AXIS2_CALL
+woden_interface_op_to_configurable(
         void *interface_op,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_interface_op_t * AXIS2_CALL
-axis2_woden_interface_op_to_nested_element(
+AXIS2_EXTERN woden_interface_op_t * AXIS2_CALL
+woden_interface_op_to_nested_element(
         void *interface_op,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_interface_op_t * AXIS2_CALL
-axis2_woden_interface_op_to_configurable_element(
+AXIS2_EXTERN woden_interface_op_t * AXIS2_CALL
+woden_interface_op_to_configurable_element(
         void *interface_op,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_interface_op_t * AXIS2_CALL
-axis2_woden_interface_op_to_documentable_element(
+AXIS2_EXTERN woden_interface_op_t * AXIS2_CALL
+woden_interface_op_to_documentable_element(
         void *interface_op,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_interface_op_t * AXIS2_CALL
-axis2_woden_interface_op_to_documentable(
+AXIS2_EXTERN woden_interface_op_t * AXIS2_CALL
+woden_interface_op_to_documentable(
         void *interface_op,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_interface_op_t * AXIS2_CALL
-axis2_woden_interface_op_to_attr_extensible(
+AXIS2_EXTERN woden_interface_op_t * AXIS2_CALL
+woden_interface_op_to_attr_extensible(
         void *interface_op,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_interface_op_t * AXIS2_CALL
-axis2_woden_interface_op_to_element_extensible(
+AXIS2_EXTERN woden_interface_op_t * AXIS2_CALL
+woden_interface_op_to_element_extensible(
         void *interface_op,
         const axis2_env_t *env);
 
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_woden_interface_op_resolve_methods(
-        axis2_woden_interface_op_t *interface_op,
+woden_interface_op_resolve_methods(
+        woden_interface_op_t *interface_op,
         const axis2_env_t *env,
-        axis2_woden_interface_op_t *interface_op_impl,
+        woden_interface_op_t *interface_op_impl,
         axis2_hash_t *methods);
 /************************End of Woden C Internal Methods***********************/
 
-#define AXIS2_WODEN_INTERFACE_OP_FREE(interface_op, env) \
-      (((axis2_woden_interface_op_t *) interface_op)->ops->free(interface_op, env))
+#define WODEN_INTERFACE_OP_FREE(interface_op, env) \
+      (((woden_interface_op_t *) interface_op)->ops->free(interface_op, env))
 
-#define AXIS2_WODEN_INTERFACE_OP_SUPER_OBJS(interface_op, env) \
-      (((axis2_woden_interface_op_t *) interface_op)->ops->super_objs(interface_op, env))
+#define WODEN_INTERFACE_OP_SUPER_OBJS(interface_op, env) \
+      (((woden_interface_op_t *) interface_op)->ops->super_objs(interface_op, env))
 
-#define AXIS2_WODEN_INTERFACE_OP_TYPE(interface_op, env) \
-      (((axis2_woden_interface_op_t *) interface_op)->ops->type(interface_op, env))
+#define WODEN_INTERFACE_OP_TYPE(interface_op, env) \
+      (((woden_interface_op_t *) interface_op)->ops->type(interface_op, env))
 
-#define AXIS2_WODEN_INTERFACE_OP_GET_BASE_IMPL(interface_op, env) \
-      (((axis2_woden_interface_op_t *) interface_op)->ops->get_base_impl(interface_op, env))
+#define WODEN_INTERFACE_OP_GET_BASE_IMPL(interface_op, env) \
+      (((woden_interface_op_t *) interface_op)->ops->get_base_impl(interface_op, env))
 
-#define AXIS2_WODEN_INTERFACE_OP_GET_QNAME(interface_op, env) \
-      (((axis2_woden_interface_op_t *) interface_op)->\
+#define WODEN_INTERFACE_OP_GET_QNAME(interface_op, env) \
+      (((woden_interface_op_t *) interface_op)->\
          get_qname(interface_op, env))
 
-#define AXIS2_WODEN_INTERFACE_OP_GET_MSG_EXCHANGE_PATTERN(interface_op, env) \
-      (((axis2_woden_interface_op_t *) interface_op)->\
+#define WODEN_INTERFACE_OP_GET_MSG_EXCHANGE_PATTERN(interface_op, env) \
+      (((woden_interface_op_t *) interface_op)->\
          get_msg_exchange_pattern(interface_op, env))
 
-#define AXIS2_WODEN_INTERFACE_OP_GET_INTERFACE_MSG_REFS(interface_op, env) \
-      (((axis2_woden_interface_op_t *) interface_op)->\
+#define WODEN_INTERFACE_OP_GET_INTERFACE_MSG_REFS(interface_op, env) \
+      (((woden_interface_op_t *) interface_op)->\
          get_interface_msg_refs(interface_op, env))
 
-#define AXIS2_WODEN_INTERFACE_OP_GET_INTERFACE_FAULT_REFS(interface_op, env) \
-      (((axis2_woden_interface_op_t *) interface_op)->\
+#define WODEN_INTERFACE_OP_GET_INTERFACE_FAULT_REFS(interface_op, env) \
+      (((woden_interface_op_t *) interface_op)->\
          get_interface_fault_refs(interface_op, env))
 
-#define AXIS2_WODEN_INTERFACE_OP_GET_STYLE(interface_op, env) \
-      (((axis2_woden_interface_op_t *) interface_op)->\
+#define WODEN_INTERFACE_OP_GET_STYLE(interface_op, env) \
+      (((woden_interface_op_t *) interface_op)->\
          get_style(interface_op, env))
 
-#define AXIS2_WODEN_INTERFACE_OP_TO_ELEMENT(interface_op, env) \
-      (((axis2_woden_interface_op_t *) interface_op)->ops->\
+#define WODEN_INTERFACE_OP_TO_ELEMENT(interface_op, env) \
+      (((woden_interface_op_t *) interface_op)->ops->\
          to_element(interface_op, env))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_WODEN_INTERFACE_OP_H */
+#endif /* WODEN_INTERFACE_OP_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_interface_op_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_op_element.h?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_op_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_op_element.h Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_WODEN_INTERFACE_OP_ELEMENT_H
-#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_H
+#ifndef WODEN_INTERFACE_OP_ELEMENT_H
+#define WODEN_INTERFACE_OP_ELEMENT_H
 
 /**
- * @file axis2_woden_interface_op_element.h
+ * @file woden_interface_op_element.h
  * @brief Axis2 Interface Msg Reference Element Interface
  * This interface represents an &lt;operation&gt; child element 
  * of the WSDL &lt;interface&gt; element. 
@@ -35,26 +35,26 @@
 #include <axis2_qname.h>
 #include <axis2_uri.h>
 #include <axis2_array_list.h>
-#include <woden/axis2_woden.h>
-#include <woden/wsdl20/xml/axis2_woden_documentable_element.h>
-#include <woden/wsdl20/xml/axis2_woden_configurable_element.h>
-#include <woden/wsdl20/xml/axis2_woden_nested_element.h>
+#include <woden/woden.h>
+#include <woden_documentable_element.h>
+#include <woden_configurable_element.h>
+#include <woden_nested_element.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-typedef struct axis2_woden_interface_op_element axis2_woden_interface_op_element_t;
-typedef struct axis2_woden_interface_op_element_ops axis2_woden_interface_op_element_ops_t;
-typedef union axis2_woden_interface_op_element_base axis2_woden_interface_op_element_base_t;
+typedef struct woden_interface_op_element woden_interface_op_element_t;
+typedef struct woden_interface_op_element_ops woden_interface_op_element_ops_t;
+typedef union woden_interface_op_element_base woden_interface_op_element_base_t;
 
-/** @defgroup axis2_woden_interface_op_element Interface Msg Reference Element
+/** @defgroup woden_interface_op_element Interface Msg Reference Element
   * @ingroup axis2_interface
   * @{
   */
 
-struct axis2_woden_interface_op_element_ops
+struct woden_interface_op_element_ops
 {
    /** 
      * Deallocate memory
@@ -65,7 +65,7 @@
             void *interface_op_element,
             const axis2_env_t *env);
  
-    axis2_woden_obj_types_t (AXIS2_CALL *
+    woden_obj_types_t (AXIS2_CALL *
     type) (
             void *interface_op_element,
             const axis2_env_t *env);
@@ -146,89 +146,89 @@
 
 };
 
-union axis2_woden_interface_op_element_base
+union woden_interface_op_element_base
 {
-    axis2_woden_documentable_element_t documentable_element;
-    axis2_woden_configurable_element_t configurable_element;
-    axis2_woden_nested_element_t nested_element;
+    woden_documentable_element_t documentable_element;
+    woden_configurable_element_t configurable_element;
+    woden_nested_element_t nested_element;
 };
 
-struct axis2_woden_interface_op_element
+struct woden_interface_op_element
 {
-    axis2_woden_interface_op_element_base_t base;
-    axis2_woden_interface_op_element_ops_t *ops;
+    woden_interface_op_element_base_t base;
+    woden_interface_op_element_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_woden_interface_op_element_t * AXIS2_CALL
-axis2_woden_interface_op_element_create(
+AXIS2_EXTERN woden_interface_op_element_t * AXIS2_CALL
+woden_interface_op_element_create(
         const axis2_env_t *env);
 
 /************************Woden C Internal Methods******************************/
 AXIS2_EXTERN 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);
 /************************End of Woden C Internal Methods***********************/
 
-#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_FREE(interface_op_element, env) \
-      (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\
+#define WODEN_INTERFACE_OP_ELEMENT_FREE(interface_op_element, env) \
+      (((woden_interface_op_element_t *) interface_op_element)->ops->\
          free (interface_op_element, env))
 
-#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_TYPE(interface_op_element, env) \
-      (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\
+#define WODEN_INTERFACE_OP_ELEMENT_TYPE(interface_op_element, env) \
+      (((woden_interface_op_element_t *) interface_op_element)->ops->\
          type (interface_op_element, env))
 
-#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_SET_QNAME(interface_op_element, env, qname) \
-      (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\
+#define WODEN_INTERFACE_OP_ELEMENT_SET_QNAME(interface_op_element, env, qname) \
+      (((woden_interface_op_element_t *) interface_op_element)->ops->\
          set_qname (interface_op_element, env, qname))
 
-#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_GET_QNAME(interface_op_element, env) \
-      (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\
+#define WODEN_INTERFACE_OP_ELEMENT_GET_QNAME(interface_op_element, env) \
+      (((woden_interface_op_element_t *) interface_op_element)->ops->\
         get_qname  (interface_op_element, env))
 
-#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_SET_PATTERN(interface_op_element, env, uri) \
-      (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\
+#define WODEN_INTERFACE_OP_ELEMENT_SET_PATTERN(interface_op_element, env, uri) \
+      (((woden_interface_op_element_t *) interface_op_element)->ops->\
          set_pattern (interface_op_element, env, uri))
 
-#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_GET_PATTERN(interface_op_element, env) \
-      (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\
+#define WODEN_INTERFACE_OP_ELEMENT_GET_PATTERN(interface_op_element, env) \
+      (((woden_interface_op_element_t *) interface_op_element)->ops->\
          get_pattern (interface_op_element, env))
 
-#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_ADD_STYLE_URI(interface_op_element, env, uri) \
-      (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\
+#define WODEN_INTERFACE_OP_ELEMENT_ADD_STYLE_URI(interface_op_element, env, uri) \
+      (((woden_interface_op_element_t *) interface_op_element)->ops->\
         add_style_uri  (interface_op_element, env, uri))
 
-#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_REMOVE_STYLE_URI(interface_op_element, env, uri) \
-      (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\
+#define WODEN_INTERFACE_OP_ELEMENT_REMOVE_STYLE_URI(interface_op_element, env, uri) \
+      (((woden_interface_op_element_t *) interface_op_element)->ops->\
         remove_style_uri  (interface_op_element, env, uri))
 
-#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_GET_STYLE(interface_op_element, env) \
-      (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\
+#define WODEN_INTERFACE_OP_ELEMENT_GET_STYLE(interface_op_element, env) \
+      (((woden_interface_op_element_t *) interface_op_element)->ops->\
         get_style  (interface_op_element, env))
 
-#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_ADD_INTERFACE_MSG_REF_ELEMENT(interface_op_element, env, msg_ref) \
-      (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\
+#define WODEN_INTERFACE_OP_ELEMENT_ADD_INTERFACE_MSG_REF_ELEMENT(interface_op_element, env, msg_ref) \
+      (((woden_interface_op_element_t *) interface_op_element)->ops->\
          add_interface_msg_ref_element (interface_op_element, env, msg_ref))
 
-#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_REMOVE_MSG_REF_ELEMENT(interface_op_element, env, msg_ref) \
-      (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\
+#define WODEN_INTERFACE_OP_ELEMENT_REMOVE_MSG_REF_ELEMENT(interface_op_element, env, msg_ref) \
+      (((woden_interface_op_element_t *) interface_op_element)->ops->\
          remove_msg_ref_element (interface_op_element, env, msg_ref))
 
-#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_GET_INTERFACE_MSG_REF_ELEMENTS(interface_op_element, env) \
-      (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\
+#define WODEN_INTERFACE_OP_ELEMENT_GET_INTERFACE_MSG_REF_ELEMENTS(interface_op_element, env) \
+      (((woden_interface_op_element_t *) interface_op_element)->ops->\
          get_interface_msg_ref_elements (interface_op_element, env))
 
-#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_ADD_INTERFACE_FAULT_REF_ELEMENT(interface_op_element, env, fault_ref) \
-      (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\
+#define WODEN_INTERFACE_OP_ELEMENT_ADD_INTERFACE_FAULT_REF_ELEMENT(interface_op_element, env, fault_ref) \
+      (((woden_interface_op_element_t *) interface_op_element)->ops->\
          add_interface_fault_ref_element (interface_op_element, env, fault_ref))
 
-#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_REMOVE_FAULT_REF_ELEMENT(interface_op_element, env, fault_ref) \
-      (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\
+#define WODEN_INTERFACE_OP_ELEMENT_REMOVE_FAULT_REF_ELEMENT(interface_op_element, env, fault_ref) \
+      (((woden_interface_op_element_t *) interface_op_element)->ops->\
          remove_fault_ref_element (interface_op_element, env, fault_ref))
 
-#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_GET_INTERFACE_FAULT_REF_ELEMENTS(interface_op_element, env) \
-      (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\
+#define WODEN_INTERFACE_OP_ELEMENT_GET_INTERFACE_FAULT_REF_ELEMENTS(interface_op_element, env) \
+      (((woden_interface_op_element_t *) interface_op_element)->ops->\
          get_interface_fault_ref_elements (interface_op_element, env))
 
 
@@ -239,4 +239,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_WODEN_INTERFACE_OP_ELEMENT_H */
+#endif /* WODEN_INTERFACE_OP_ELEMENT_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_msg_label.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_msg_label.h?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_msg_label.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_msg_label.h Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_WODEN_MSG_LABEL_H
-#define AXIS2_WODEN_MSG_LABEL_H
+#ifndef WODEN_MSG_LABEL_H
+#define WODEN_MSG_LABEL_H
 
 /**
- * @file axis2_woden_msg_label.h
+ * @file woden_msg_label.h
  * @brief Axis2 Message Label Interface
  * This class defines the values of the {msg_label} property of
  * Interface Message Reference and Interface Fault Reference. This property 
@@ -39,8 +39,8 @@
  * <p>
  * Examples:
  * <pre>
- *     AXIS2_WODEN_INTERFACE_MSG_REF_SET_MSG_LABEL(msg_ref, env, msg_ref->AXIS2_WODEN_IN);
- *     if(msg_ref->AXIS2_WODEN_IN == AXIS2_WODEN_INTERFACE_MSG_REF_GET_MSG_LABEL(msg_ref, env))
+ *     WODEN_INTERFACE_MSG_REF_SET_MSG_LABEL(msg_ref, env, msg_ref->WODEN_IN);
+ *     if(msg_ref->WODEN_IN == WODEN_INTERFACE_MSG_REF_GET_MSG_LABEL(msg_ref, env))
  *          ...
  *     
  * </pre>
@@ -54,23 +54,23 @@
 #include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <woden/axis2_woden.h>
+#include <woden/woden.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-typedef struct axis2_woden_msg_label axis2_woden_msg_label_t;
-typedef struct axis2_woden_msg_label_ops axis2_woden_msg_label_ops_t;
-struct axis2_woden_ext_element;
+typedef struct woden_msg_label woden_msg_label_t;
+typedef struct woden_msg_label_ops woden_msg_label_ops_t;
+struct woden_ext_element;
 
-/** @defgroup axis2_woden_msg_label Message Label
+/** @defgroup woden_msg_label Message Label
   * @ingroup axis2_wsdl
   * @{
   */
 
-struct axis2_woden_msg_label_ops
+struct woden_msg_label_ops
 {
    /** 
      * Deallocate memory
@@ -95,44 +95,44 @@
     equals) (
             void *msg_label,
             const axis2_env_t *env,
-            axis2_woden_msg_label_t *other);
+            woden_msg_label_t *other);
 
 
 };
 
-struct axis2_woden_msg_label
+struct woden_msg_label
 {
-    axis2_woden_msg_label_ops_t *ops;
+    woden_msg_label_ops_t *ops;
     
 };
 
-AXIS2_EXTERN axis2_woden_msg_label_t *AXIS2_CALL
-axis2_woden_msg_label_get_msg_label_in(
+AXIS2_EXTERN woden_msg_label_t *AXIS2_CALL
+woden_msg_label_get_msg_label_in(
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_msg_label_t *AXIS2_CALL
-axis2_woden_msg_label_get_msg_label_out(
+AXIS2_EXTERN woden_msg_label_t *AXIS2_CALL
+woden_msg_label_get_msg_label_out(
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_msg_label_t *AXIS2_CALL
-axis2_woden_msg_label_get_invalid_value(
+AXIS2_EXTERN woden_msg_label_t *AXIS2_CALL
+woden_msg_label_get_invalid_value(
         const axis2_env_t *env,
         const axis2_char_t *value);
 
-#define AXIS2_WODEN_MSG_LABEL_FREE(msg_label, env) \
-      (((axis2_woden_msg_label_t *) msg_label)->ops->\
+#define WODEN_MSG_LABEL_FREE(msg_label, env) \
+      (((woden_msg_label_t *) msg_label)->ops->\
          free (msg_label, env))
 
-#define AXIS2_WODEN_MSG_LABEL_TO_STRING(msg_label, env) \
-      (((axis2_woden_msg_label_t *) msg_label)->ops->\
+#define WODEN_MSG_LABEL_TO_STRING(msg_label, env) \
+      (((woden_msg_label_t *) msg_label)->ops->\
          to_string (msg_label, env))
 
-#define AXIS2_WODEN_MSG_LABEL_IS_VALID(msg_label, env) \
-      (((axis2_woden_msg_label_t *) msg_label)->ops->\
+#define WODEN_MSG_LABEL_IS_VALID(msg_label, env) \
+      (((woden_msg_label_t *) msg_label)->ops->\
          is_valid (msg_label, env))
 
-#define AXIS2_WODEN_MSG_LABEL_EQUALS(msg_label, env, other) \
-      (((axis2_woden_msg_label_t *) msg_label)->ops->\
+#define WODEN_MSG_LABEL_EQUALS(msg_label, env, other) \
+      (((woden_msg_label_t *) msg_label)->ops->\
          equals (msg_label, env, other))
 
 
@@ -140,4 +140,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_WODEN_MSG_LABEL_H */
+#endif /* WODEN_MSG_LABEL_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_nc_name.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_nc_name.h?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_nc_name.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_nc_name.h Tue Jun 13 22:23:14 2006
@@ -32,7 +32,7 @@
 #include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_uri.h>
-#include <woden/axis2_woden.h>
+#include <woden/woden.h>
 
 #ifdef __cplusplus
 extern "C"

Modified: webservices/axis2/trunk/c/woden/include/woden_nested_component.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_nested_component.h?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_nested_component.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_nested_component.h Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_WODEN_NESTED_COMPONENT_H
-#define AXIS2_WODEN_NESTED_COMPONENT_H
+#ifndef WODEN_NESTED_COMPONENT_H
+#define WODEN_NESTED_COMPONENT_H
 
 /**
- * @file axis2_woden_nested_component.h
+ * @file woden_nested_component.h
  * @brief Axis2 Nested Component Interface
  * Components which are nested within a 'top-level' component will extend
  * this interface. These are Property, Feature and the sub components of
@@ -35,24 +35,24 @@
 #include <axis2_string.h>
 #include <axis2_utils.h>
 #include <axis2_hash.h>
-#include <woden/axis2_woden.h>
-#include <woden/wsdl20/axis2_woden_wsdl_component.h>
+#include <woden/woden.h>
+#include <woden_wsdl_component.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-typedef struct axis2_woden_nested_component axis2_woden_nested_component_t;
-typedef struct axis2_woden_nested_component_ops axis2_woden_nested_component_ops_t;
-struct axis2_woden_component_exts;
+typedef struct woden_nested_component woden_nested_component_t;
+typedef struct woden_nested_component_ops woden_nested_component_ops_t;
+struct woden_component_exts;
 
-/** @defgroup axis2_woden_nested_component Nested Component
+/** @defgroup woden_nested_component Nested Component
   * @ingroup axis2_wsdl
   * @{
   */
 
-struct axis2_woden_nested_component_ops
+struct woden_nested_component_ops
 {
    /** 
      * Deallocate memory
@@ -68,7 +68,7 @@
             void *nested_component,
             const axis2_env_t *env);
     
-    axis2_woden_obj_types_t (AXIS2_CALL *
+    woden_obj_types_t (AXIS2_CALL *
     type) (
             void *nested_component,
             const axis2_env_t *env);
@@ -80,40 +80,40 @@
 
 };
 
-struct axis2_woden_nested_component
+struct woden_nested_component
 {
-    axis2_woden_wsdl_component_t wsdl_component;
-    axis2_woden_nested_component_ops_t *ops;
+    woden_wsdl_component_t wsdl_component;
+    woden_nested_component_ops_t *ops;
 };
 
 /************************Woden C Internal Methods******************************/
 axis2_status_t AXIS2_CALL
-axis2_woden_nested_component_resolve_methods(
-        axis2_woden_nested_component_t *nested_component,
+woden_nested_component_resolve_methods(
+        woden_nested_component_t *nested_component,
         const axis2_env_t *env,
         axis2_hash_t *methods);
 /************************End of Woden C Internal Methods***********************/
 
-#define AXIS2_WODEN_NESTED_COMPONENT_FREE(nested_component, env) \
-      (((axis2_woden_nested_component_t *) nested_component)->ops->\
+#define WODEN_NESTED_COMPONENT_FREE(nested_component, env) \
+      (((woden_nested_component_t *) nested_component)->ops->\
          free (nested_component, env))
 
-#define AXIS2_WODEN_NESTED_COMPONENT_TO_NESTED_COMPONENT_FREE(nested_component, \
+#define WODEN_NESTED_COMPONENT_TO_NESTED_COMPONENT_FREE(nested_component, \
         env) \
-      (((axis2_woden_nested_component_t *) nested_component)->ops->\
+      (((woden_nested_component_t *) nested_component)->ops->\
          to_nested_component_free (nested_component, env))
 
-#define AXIS2_WODEN_NESTED_COMPONENT_TYPE(nested_component, env) \
-      (((axis2_woden_nested_component_t *) nested_component)->ops->\
+#define WODEN_NESTED_COMPONENT_TYPE(nested_component, env) \
+      (((woden_nested_component_t *) nested_component)->ops->\
          type (nested_component, env))
 
-#define AXIS2_WODEN_NESTED_COMPONENT_GET_PARENT(\
+#define WODEN_NESTED_COMPONENT_GET_PARENT(\
         nested_component, env) \
-      (((axis2_woden_nested_component_t *) nested_component)->ops->\
+      (((woden_nested_component_t *) nested_component)->ops->\
          get_parent(nested_component, env))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_WODEN_NESTED_COMPONENT_H */
+#endif /* WODEN_NESTED_COMPONENT_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_nested_configurable.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_nested_configurable.h?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_nested_configurable.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_nested_configurable.h Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_WODEN_NESTED_CONFIGURABLE_H
-#define AXIS2_WODEN_NESTED_CONFIGURABLE_H
+#ifndef WODEN_NESTED_CONFIGURABLE_H
+#define WODEN_NESTED_CONFIGURABLE_H
 
 /**
- * @file axis2_woden_nested_configurable.h
+ * @file woden_nested_configurable.h
  * @brief Axis2 Nested Configurable Interface
  * This abstract superclass implements support for accessing or
  * setting the 'parent' of a nested, configurable WSDL component.
@@ -27,26 +27,26 @@
  * 
  */
 
-#include <woden/axis2_woden.h>
-#include <woden/wsdl20/axis2_woden_nested_component.h>
-#include <woden/wsdl20/xml/axis2_woden_nested_element.h>
-#include <woden/wsdl20/axis2_woden_configurable.h>
+#include <woden/woden.h>
+#include <woden_nested_component.h>
+#include <woden_nested_element.h>
+#include <woden_configurable.h>
 
-/** @defgroup axis2_woden_nested_configurable Nested Configurable
+/** @defgroup woden_nested_configurable Nested Configurable
   * @ingroup axis2_wsdl
   * @{
   */
 
-typedef union axis2_woden_nested_configurable_base axis2_woden_nested_configurable_base_t;
-typedef struct axis2_woden_nested_configurable axis2_woden_nested_configurable_t;
-typedef struct axis2_woden_nested_configurable_ops axis2_woden_nested_configurable_ops_t;
+typedef union woden_nested_configurable_base woden_nested_configurable_base_t;
+typedef struct woden_nested_configurable woden_nested_configurable_t;
+typedef struct woden_nested_configurable_ops woden_nested_configurable_ops_t;
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_woden_nested_configurable_ops
+struct woden_nested_configurable_ops
 {
    /** 
      * Deallocate memory
@@ -70,58 +70,58 @@
     /**
      * @return the base implementation class
      */
-    struct axis2_woden_configurable *(AXIS2_CALL *
+    struct woden_configurable *(AXIS2_CALL *
     get_base_impl) (
             void *nested_configurable,
             const axis2_env_t *env);
 
 };
 
-union axis2_woden_nested_configurable_base
+union woden_nested_configurable_base
 {
-    axis2_woden_configurable_t configurable;
-    axis2_woden_nested_element_t nested_element;
-    axis2_woden_nested_component_t nested_component;
+    woden_configurable_t configurable;
+    woden_nested_element_t nested_element;
+    woden_nested_component_t nested_component;
 };
 
-struct axis2_woden_nested_configurable
+struct woden_nested_configurable
 {
-    axis2_woden_nested_configurable_base_t base;
-    axis2_woden_nested_configurable_ops_t *ops;
+    woden_nested_configurable_base_t base;
+    woden_nested_configurable_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_woden_nested_configurable_t * AXIS2_CALL
-axis2_woden_nested_configurable_create(
+AXIS2_EXTERN woden_nested_configurable_t * AXIS2_CALL
+woden_nested_configurable_create(
         const axis2_env_t *env);
 
 /************************Woden C Internal Methods******************************/
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_woden_nested_configurable_resolve_methods(
-        axis2_woden_nested_configurable_t *nested_configurable,
+woden_nested_configurable_resolve_methods(
+        woden_nested_configurable_t *nested_configurable,
         const axis2_env_t *env,
-        axis2_woden_nested_configurable_t *nested_configurable_impl,
+        woden_nested_configurable_t *nested_configurable_impl,
         axis2_hash_t *methods);
 /************************End of Woden C Internal Methods***********************/
 
 
-#define AXIS2_WODEN_NESTED_CONFIGURABLE_FREE(nested_configurable, env) \
-      (((axis2_woden_nested_configurable_t *) nested_configurable)->ops->\
+#define WODEN_NESTED_CONFIGURABLE_FREE(nested_configurable, env) \
+      (((woden_nested_configurable_t *) nested_configurable)->ops->\
          free(nested_configurable, env))
 
-#define AXIS2_WODEN_NESTED_CONFIGURABLE_TO_NESTED_CONFIGURABLE_FREE(nested_configurable, env) \
-      (((axis2_woden_nested_configurable_t *) nested_configurable)->ops->\
+#define WODEN_NESTED_CONFIGURABLE_TO_NESTED_CONFIGURABLE_FREE(nested_configurable, env) \
+      (((woden_nested_configurable_t *) nested_configurable)->ops->\
          to_nested_configurable_free(nested_configurable, env))
 
-#define AXIS2_WODEN_NESTED_CONFIGURABLE_SUPER_OBJS(nested_configurable, env) \
-      (((axis2_woden_nested_configurable_t *) nested_configurable)->ops->\
+#define WODEN_NESTED_CONFIGURABLE_SUPER_OBJS(nested_configurable, env) \
+      (((woden_nested_configurable_t *) nested_configurable)->ops->\
          super_objs(nested_configurable, env))
 
-#define AXIS2_WODEN_NESTED_CONFIGURABLE_GET_BASE_IMPL(nested_configurable, env) \
-      (((axis2_woden_nested_configurable_t *) nested_configurable)->ops->\
+#define WODEN_NESTED_CONFIGURABLE_GET_BASE_IMPL(nested_configurable, env) \
+      (((woden_nested_configurable_t *) nested_configurable)->ops->\
          get_base_impl(nested_configurable, env))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_WODEN_NESTED_CONFIGURABLE_H */
+#endif /* WODEN_NESTED_CONFIGURABLE_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_nested_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_nested_element.h?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_nested_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_nested_element.h Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_WODEN_NESTED_ELEMENT_H
-#define AXIS2_WODEN_NESTED_ELEMENT_H
+#ifndef WODEN_NESTED_ELEMENT_H
+#define WODEN_NESTED_ELEMENT_H
 
 /**
- * @file axis2_woden_nested_element.h
+ * @file woden_nested_element.h
  * @brief Axis2 Nested Element Interface
  * Elements which are nested within a 'top-level' WSDL element will
  * extend this interface. These are &lt;feature&gt;, &lt;property&gt;
@@ -39,24 +39,24 @@
 #include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <woden/axis2_woden.h>
-#include <woden/wsdl20/xml/axis2_woden_wsdl_element.h>
+#include <woden/woden.h>
+#include <woden_wsdl_element.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-typedef struct axis2_woden_nested_element axis2_woden_nested_element_t;
-typedef struct axis2_woden_nested_element_ops axis2_woden_nested_element_ops_t;
-struct axis2_woden_wsdl_element;
+typedef struct woden_nested_element woden_nested_element_t;
+typedef struct woden_nested_element_ops woden_nested_element_ops_t;
+struct woden_wsdl_element;
 
-/** @defgroup axis2_woden_nested_element Nested Element
+/** @defgroup woden_nested_element Nested Element
   * @ingroup axis2_wsdl
   * @{
   */
 
-struct axis2_woden_nested_element_ops
+struct woden_nested_element_ops
 {
    /** 
      * Deallocate memory
@@ -67,7 +67,7 @@
             void *doc_el,
             const axis2_env_t *env);
     
-    axis2_woden_obj_types_t (AXIS2_CALL *
+    woden_obj_types_t (AXIS2_CALL *
     type) (
             void *doc_el,
             const axis2_env_t *env);
@@ -76,7 +76,7 @@
     set_parent_element) (
             void *doc_el,
             const axis2_env_t *env,
-            struct axis2_woden_wsdl_element *parent);
+            struct woden_wsdl_element *parent);
 
     void *(AXIS2_CALL *
     get_parent_element) (
@@ -85,34 +85,34 @@
 
 };
 
-struct axis2_woden_nested_element
+struct woden_nested_element
 {
-    axis2_woden_wsdl_element_t wsdl_element;
-    axis2_woden_nested_element_ops_t *ops;
+    woden_wsdl_element_t wsdl_element;
+    woden_nested_element_ops_t *ops;
 };
 
 /************************Woden C Internal Methods*****************************/
 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);
 /************************End of Woden C Internal Methods***********************/
 
-#define AXIS2_WODEN_NESTED_ELEMENT_FREE(doc_el, env) \
-      (((axis2_woden_nested_element_t *) doc_el)->ops->\
+#define WODEN_NESTED_ELEMENT_FREE(doc_el, env) \
+      (((woden_nested_element_t *) doc_el)->ops->\
          free (doc_el, env))
 
-#define AXIS2_WODEN_NESTED_ELEMENT_TYPE(doc_el, env) \
-      (((axis2_woden_nested_element_t *) doc_el)->ops->\
+#define WODEN_NESTED_ELEMENT_TYPE(doc_el, env) \
+      (((woden_nested_element_t *) doc_el)->ops->\
          type (doc_el, env))
 
-#define AXIS2_WODEN_NESTED_ELEMENT_SET_PARENT_ELEMENT(doc_el, env, parent) \
-      (((axis2_woden_nested_element_t *) doc_el)->ops->\
+#define WODEN_NESTED_ELEMENT_SET_PARENT_ELEMENT(doc_el, env, parent) \
+      (((woden_nested_element_t *) doc_el)->ops->\
          set_parent_element(doc_el, env, parent))
 
-#define AXIS2_WODEN_NESTED_ELEMENT_GET_PARENT_ELEMENT(doc_el, env) \
-      (((axis2_woden_nested_element_t *) doc_el)->ops->\
+#define WODEN_NESTED_ELEMENT_GET_PARENT_ELEMENT(doc_el, env) \
+      (((woden_nested_element_t *) doc_el)->ops->\
          get_parent_element(doc_el, env))
 
 
@@ -120,4 +120,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_WODEN_NESTED_ELEMENT_H */
+#endif /* WODEN_NESTED_ELEMENT_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_property.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_property.h?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_property.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_property.h Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_WODEN_PROPERTY_H
-#define AXIS2_WODEN_PROPERTY_H
+#ifndef WODEN_PROPERTY_H
+#define WODEN_PROPERTY_H
 
 /**
- * @file axis2_woden_property.h
+ * @file woden_property.h
  * @brief Axis2 Property Interface
  * An abstract superclass for WSDL 2.0 elements which can have &lt;documentation&gt; 
  * child elements. That is, all WSDL 2.0 elements except the &lt;documentation&gt; 
@@ -26,30 +26,30 @@
  * 
  */
 
-#include <woden/axis2_woden.h>
-#include <woden/wsdl20/xml/axis2_woden_property_element.h>
-#include <woden/axis2_woden_wsdl_obj.h>
-#include <woden/wsdl20/axis2_woden_documentable.h>
-#include <woden/wsdl20/axis2_woden_nested_component.h>
+#include <woden/woden.h>
+#include <woden_property_element.h>
+#include <woden/woden_wsdl_obj.h>
+#include <woden_documentable.h>
+#include <woden_nested_component.h>
 
-/** @defgroup axis2_woden_property Property
+/** @defgroup woden_property Property
   * @ingroup axis2_wsdl
   * @{
   */
 
-typedef union axis2_woden_property_base axis2_woden_property_base_t;
-typedef struct axis2_woden_property axis2_woden_property_t;
-typedef struct axis2_woden_property_ops axis2_woden_property_ops_t;
-struct axis2_woden_documentation_element;
-struct axis2_woden_wsdl_component;
-struct axis2_woden_documentable;
+typedef union woden_property_base woden_property_base_t;
+typedef struct woden_property woden_property_t;
+typedef struct woden_property_ops woden_property_ops_t;
+struct woden_documentation_element;
+struct woden_wsdl_component;
+struct woden_documentable;
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_woden_property_ops
+struct woden_property_ops
 {
    /** 
      * Deallocate memory
@@ -63,13 +63,13 @@
     super_objs) (void *property,
             const axis2_env_t *env);
 
-    axis2_woden_obj_types_t (AXIS2_CALL *
+    woden_obj_types_t (AXIS2_CALL *
     type) (void *property,
             const axis2_env_t *env);
     /**
      * @return the base implementation class
      */
-    struct axis2_woden_documentable *(AXIS2_CALL *
+    struct woden_documentable *(AXIS2_CALL *
     get_base_impl) (
             void *property,
             const axis2_env_t *env);
@@ -116,121 +116,121 @@
 
 };
 
-union axis2_woden_property_base
+union woden_property_base
 {
-    axis2_woden_documentable_t documentable;
-    axis2_woden_property_element_t property_element;
-    axis2_woden_nested_component_t nested_component;
+    woden_documentable_t documentable;
+    woden_property_element_t property_element;
+    woden_nested_component_t nested_component;
 };
 
-struct axis2_woden_property
+struct woden_property
 {
-    axis2_woden_property_base_t base;
-    axis2_woden_property_ops_t *ops;
+    woden_property_base_t base;
+    woden_property_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL
-axis2_woden_property_create(
+AXIS2_EXTERN woden_property_t * AXIS2_CALL
+woden_property_create(
         const axis2_env_t *env);
 
 
 /***************************Woden C Internal Methods***************************/
-AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL
-axis2_woden_property_to_property_element(
+AXIS2_EXTERN woden_property_t * AXIS2_CALL
+woden_property_to_property_element(
         void *property,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL
-axis2_woden_property_to_nested_element(
+AXIS2_EXTERN woden_property_t * AXIS2_CALL
+woden_property_to_nested_element(
         void *property,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL
-axis2_woden_property_to_documentable_element(
+AXIS2_EXTERN woden_property_t * AXIS2_CALL
+woden_property_to_documentable_element(
         void *property,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL
-axis2_woden_property_to_documentable(
+AXIS2_EXTERN woden_property_t * AXIS2_CALL
+woden_property_to_documentable(
         void *property,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL
-axis2_woden_property_to_wsdl_obj(
+AXIS2_EXTERN woden_property_t * AXIS2_CALL
+woden_property_to_wsdl_obj(
         void *property,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL
-axis2_woden_property_to_nested_component(
+AXIS2_EXTERN woden_property_t * AXIS2_CALL
+woden_property_to_nested_component(
         void *property,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL
-axis2_woden_property_to_wsdl_component(
+AXIS2_EXTERN woden_property_t * AXIS2_CALL
+woden_property_to_wsdl_component(
         void *property,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL
-axis2_woden_property_to_element_extensible(
+AXIS2_EXTERN woden_property_t * AXIS2_CALL
+woden_property_to_element_extensible(
         void *property,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL
-axis2_woden_property_to_attr_extensible(
+AXIS2_EXTERN woden_property_t * AXIS2_CALL
+woden_property_to_attr_extensible(
         void *property,
         const axis2_env_t *env);
 
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_woden_property_resolve_methods(
-        axis2_woden_property_t *property,
+woden_property_resolve_methods(
+        woden_property_t *property,
         const axis2_env_t *env,
-        axis2_woden_property_t *property_impl,
+        woden_property_t *property_impl,
         axis2_hash_t *methods);
 /************************End of Woden C Internal Methods***********************/
 
-#define AXIS2_WODEN_PROPERTY_FREE(property, env) \
-      (((axis2_woden_property_t *) property)->ops->free(property, env))
+#define WODEN_PROPERTY_FREE(property, env) \
+      (((woden_property_t *) property)->ops->free(property, env))
 
-#define AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env) \
-      (((axis2_woden_property_t *) property)->ops->super_objs(property, env))
+#define WODEN_PROPERTY_SUPER_OBJS(property, env) \
+      (((woden_property_t *) property)->ops->super_objs(property, env))
 
-#define AXIS2_WODEN_PROPERTY_TYPE(property, env) \
-      (((axis2_woden_property_t *) property)->ops->type(property, env))
+#define WODEN_PROPERTY_TYPE(property, env) \
+      (((woden_property_t *) property)->ops->type(property, env))
 
-#define AXIS2_WODEN_PROPERTY_GET_BASE_IMPL(property, env) \
-      (((axis2_woden_property_t *) property)->ops->get_base_impl(property, env))
+#define WODEN_PROPERTY_GET_BASE_IMPL(property, env) \
+      (((woden_property_t *) property)->ops->get_base_impl(property, env))
 
-#define AXIS2_WODEN_PROPERTY_GET_REF(property, env) \
-      (((axis2_woden_property_t *) property)->\
+#define WODEN_PROPERTY_GET_REF(property, env) \
+      (((woden_property_t *) property)->\
          get_ref(property, env))
 
-#define AXIS2_WODEN_PROPERTY_GET_VALUE_CONSTRAINT(property, env) \
-      (((axis2_woden_property_t *) property)->\
+#define WODEN_PROPERTY_GET_VALUE_CONSTRAINT(property, env) \
+      (((woden_property_t *) property)->\
          get_value_constraint(property, env))
 
-#define AXIS2_WODEN_PROPERTY_GET_VALUE(property, env) \
-      (((axis2_woden_property_t *) property)->\
+#define WODEN_PROPERTY_GET_VALUE(property, env) \
+      (((woden_property_t *) property)->\
          get_value(property, env))
 
-#define AXIS2_WODEN_PROPERTY_GET_PARENT(property, env) \
-      (((axis2_woden_property_t *) property)->ops->\
+#define WODEN_PROPERTY_GET_PARENT(property, env) \
+      (((woden_property_t *) property)->ops->\
          get_parent(property, env))
 
-#define AXIS2_WODEN_PROPERTY_TO_ELEMENT(property, env) \
-      (((axis2_woden_property_t *) property)->ops->\
+#define WODEN_PROPERTY_TO_ELEMENT(property, env) \
+      (((woden_property_t *) property)->ops->\
          to_element(property, env))
 
-#define AXIS2_WODEN_PROPERTY_SET_VALUE_CONSTRAINT(property, env, type_def) \
-      (((axis2_woden_property_t *) property)->ops->\
+#define WODEN_PROPERTY_SET_VALUE_CONSTRAINT(property, env, type_def) \
+      (((woden_property_t *) property)->ops->\
          set_value_constraint(property, env, type_def))
 
-#define AXIS2_WODEN_PROPERTY_SET_TYPES(property, env, types) \
-      (((axis2_woden_property_t *) property)->ops->\
+#define WODEN_PROPERTY_SET_TYPES(property, env, types) \
+      (((woden_property_t *) property)->ops->\
          set_types(property, env, types))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_WODEN_PROPERTY_H */
+#endif /* WODEN_PROPERTY_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_property_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_property_element.h?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_property_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_property_element.h Tue Jun 13 22:23:14 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_WODEN_PROPERTY_ELEMENT_H
-#define AXIS2_WODEN_PROPERTY_ELEMENT_H
+#ifndef WODEN_PROPERTY_ELEMENT_H
+#define WODEN_PROPERTY_ELEMENT_H
 
 /**
- * @file axis2_woden_property_element.h
+ * @file woden_property_element.h
  * Represents the &lt;property&gt; element and its child elements;
  * &lt;documentation&gt;, 
  * &lt;value&gt; or &lt;constraint&gt; and
@@ -42,27 +42,27 @@
 #include <axis2_qname.h>
 #include <axis2_generic_obj.h>
 #include <axis2_uri.h>
-#include <woden/axis2_woden.h>
-#include <woden/wsdl20/xml/axis2_woden_documentable_element.h>
-#include <woden/wsdl20/xml/axis2_woden_nested_element.h>
-#include <woden/axis2_woden.h>
+#include <woden/woden.h>
+#include <woden_documentable_element.h>
+#include <woden_nested_element.h>
+#include <woden/woden.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-typedef struct axis2_woden_property_element axis2_woden_property_element_t;
-typedef struct axis2_woden_property_element_ops axis2_woden_property_element_ops_t;
-typedef union axis2_woden_property_element_base axis2_woden_property_element_base_t;
+typedef struct woden_property_element woden_property_element_t;
+typedef struct woden_property_element_ops woden_property_element_ops_t;
+typedef union woden_property_element_base woden_property_element_base_t;
 struct xml_schema_type;
 
-/** @defgroup axis2_woden_property_element Property Element
+/** @defgroup woden_property_element Property Element
   * @ingroup axis2_wsdl
   * @{
   */
 
-struct axis2_woden_property_element_ops
+struct woden_property_element_ops
 {
    /** 
      * Deallocate memory
@@ -73,7 +73,7 @@
             void *doc_el,
             const axis2_env_t *env);
     
-    axis2_woden_obj_types_t (AXIS2_CALL *
+    woden_obj_types_t (AXIS2_CALL *
     type) (
             void *doc_el,
             const axis2_env_t *env);
@@ -156,60 +156,60 @@
 
 };
 
-union axis2_woden_property_element_base
+union woden_property_element_base
 {
-    axis2_woden_documentable_element_t documentable_element;
-    axis2_woden_nested_element_t nested_element;
+    woden_documentable_element_t documentable_element;
+    woden_nested_element_t nested_element;
 };
 
-struct axis2_woden_property_element
+struct woden_property_element
 {
-    axis2_woden_property_element_base_t base;
-    axis2_woden_property_element_ops_t *ops;
+    woden_property_element_base_t base;
+    woden_property_element_ops_t *ops;
 };
 
 /************************Woden C Internal Methods*****************************/
 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);
 /************************End of Woden C Internal Methods***********************/
 
-#define AXIS2_WODEN_PROPERTY_ELEMENT_FREE(doc_el, env) \
-      (((axis2_woden_property_element_t *) doc_el)->ops->\
+#define WODEN_PROPERTY_ELEMENT_FREE(doc_el, env) \
+      (((woden_property_element_t *) doc_el)->ops->\
          free (doc_el, env))
 
-#define AXIS2_WODEN_PROPERTY_ELEMENT_TYPE(doc_el, env) \
-      (((axis2_woden_property_element_t *) doc_el)->ops->\
+#define WODEN_PROPERTY_ELEMENT_TYPE(doc_el, env) \
+      (((woden_property_element_t *) doc_el)->ops->\
          type (doc_el, env))
 
-#define AXIS2_WODEN_PROPERTY_ELEMENT_SET_REF(doc_el, env, uri) \
-      (((axis2_woden_property_element_t *) doc_el)->ops->\
+#define WODEN_PROPERTY_ELEMENT_SET_REF(doc_el, env, uri) \
+      (((woden_property_element_t *) doc_el)->ops->\
          set_ref(doc_el, env, uri))
 
-#define AXIS2_WODEN_PROPERTY_ELEMENT_GET_REF(doc_el, env) \
-      (((axis2_woden_property_element_t *) doc_el)->ops->\
+#define WODEN_PROPERTY_ELEMENT_GET_REF(doc_el, env) \
+      (((woden_property_element_t *) doc_el)->ops->\
          get_ref(doc_el, env))
 
-#define AXIS2_WODEN_PROPERTY_ELEMENT_SET_CONSTRAINT_QNAME(doc_el, env, qname) \
-      (((axis2_woden_property_element_t *) doc_el)->ops->\
+#define WODEN_PROPERTY_ELEMENT_SET_CONSTRAINT_QNAME(doc_el, env, qname) \
+      (((woden_property_element_t *) doc_el)->ops->\
          set_constraint_qname(doc_el, env, qname))
 
-#define AXIS2_WODEN_PROPERTY_ELEMENT_GET_CONSTRAINT_QNAME(doc_el, env) \
-      (((axis2_woden_property_element_t *) doc_el)->ops->\
+#define WODEN_PROPERTY_ELEMENT_GET_CONSTRAINT_QNAME(doc_el, env) \
+      (((woden_property_element_t *) doc_el)->ops->\
          get_constraint_qname(doc_el, env))
 
-#define AXIS2_WODEN_PROPERTY_ELEMENT_GET_CONSTRAINT(doc_el, env) \
-      (((axis2_woden_property_element_t *) doc_el)->ops->\
+#define WODEN_PROPERTY_ELEMENT_GET_CONSTRAINT(doc_el, env) \
+      (((woden_property_element_t *) doc_el)->ops->\
          get_constraint(doc_el, env))
 
-#define AXIS2_WODEN_PROPERTY_ELEMENT_SET_HAS_VALUE_TOKEN(doc_el, env, b) \
-      (((axis2_woden_property_element_t *) doc_el)->ops->\
+#define WODEN_PROPERTY_ELEMENT_SET_HAS_VALUE_TOKEN(doc_el, env, b) \
+      (((woden_property_element_t *) doc_el)->ops->\
          set_has_value_token(doc_el, env, b))
 
-#define AXIS2_WODEN_PROPERTY_ELEMENT_HAS_VALUE_TOKEN(doc_el, env) \
-      (((axis2_woden_property_element_t *) doc_el)->ops->\
+#define WODEN_PROPERTY_ELEMENT_HAS_VALUE_TOKEN(doc_el, env) \
+      (((woden_property_element_t *) doc_el)->ops->\
          has_value_token(doc_el, env))
 
 
@@ -217,4 +217,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_WODEN_PROPERTY_ELEMENT_H */
+#endif /* WODEN_PROPERTY_ELEMENT_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_qname_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_qname_attr.h?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_qname_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_qname_attr.h Tue Jun 13 22:23:14 2006
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_WODEN_QNAME_ATTR_H
-#define AXIS2_WODEN_QNAME_ATTR_H
+#ifndef WODEN_QNAME_ATTR_H
+#define WODEN_QNAME_ATTR_H
 
 /**
- * @file axis2_woden_qname_attr.h
+ * @file woden_qname_attr.h
  * @brief Axis2 Qname Attribute Interface
  *          This class represents XML attribute information items of type xs:QName.
  */
 
-#include <woden/axis2_woden.h>
-#include <woden/xml/axis2_woden_xml_attr.h>
+#include <woden/woden.h>
+#include <woden_xml_attr.h>
 
-/** @defgroup axis2_woden_qname_attr Qname Attribute
+/** @defgroup woden_qname_attr Qname Attribute
   * @ingroup axis2_wsdl
   * @{
   */
 
-typedef struct axis2_woden_qname_attr axis2_woden_qname_attr_t;
-typedef struct axis2_woden_qname_attr_ops axis2_woden_qname_attr_ops_t;
+typedef struct woden_qname_attr woden_qname_attr_t;
+typedef struct woden_qname_attr_ops woden_qname_attr_ops_t;
 struct axiom_element;
 struct axiom_node;
 
@@ -41,7 +41,7 @@
 {
 #endif
 
-struct axis2_woden_qname_attr_ops
+struct woden_qname_attr_ops
 {
    /** 
      * Deallocate memory
@@ -57,7 +57,7 @@
             void *qname_attr,
             const axis2_env_t *env);
     
-    axis2_woden_obj_types_t (AXIS2_CALL *
+    woden_obj_types_t (AXIS2_CALL *
     type) (
             void *qname_attr,
             const axis2_env_t *env);
@@ -65,7 +65,7 @@
     /**
      * @return the base implementation class
      */
-    axis2_woden_xml_attr_t *(AXIS2_CALL *
+    woden_xml_attr_t *(AXIS2_CALL *
     get_base_impl) (
             void *qname_attr,
             const axis2_env_t *env);
@@ -99,18 +99,18 @@
   
 };
 
-struct axis2_woden_qname_attr
+struct woden_qname_attr
 {
-    axis2_woden_xml_attr_t base;
-    axis2_woden_qname_attr_ops_t *ops;
+    woden_xml_attr_t base;
+    woden_qname_attr_ops_t *ops;
 };
 
 /*
  * 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,
         struct axiom_element *owner_el,
         struct axiom_node *owner_node,
@@ -120,36 +120,36 @@
 
 /************************Woden C Internal Methods******************************/
 AXIS2_EXTERN 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);
 /************************End of Woden C Internal Methods***********************/
 
-#define AXIS2_WODEN_QNAME_ATTR_FREE(qname_attr, env) \
-      (((axis2_woden_qname_attr_t *) qname_attr)->ops->free(qname_attr, env))
+#define WODEN_QNAME_ATTR_FREE(qname_attr, env) \
+      (((woden_qname_attr_t *) qname_attr)->ops->free(qname_attr, env))
 
-#define AXIS2_WODEN_QNAME_ATTR_TO_QNAME_ATTR_FREE(qname_attr, env) \
-      (((axis2_woden_qname_attr_t *) qname_attr)->ops->\
+#define WODEN_QNAME_ATTR_TO_QNAME_ATTR_FREE(qname_attr, env) \
+      (((woden_qname_attr_t *) qname_attr)->ops->\
          to_qname_attr_free(qname_attr, env))
 
-#define AXIS2_WODEN_QNAME_ATTR_TYPE(qname_attr, env) \
-      (((axis2_woden_qname_attr_t *) qname_attr)->ops->type(qname_attr, env))
+#define WODEN_QNAME_ATTR_TYPE(qname_attr, env) \
+      (((woden_qname_attr_t *) qname_attr)->ops->type(qname_attr, env))
 
-#define AXIS2_WODEN_QNAME_ATTR_GET_BASE_IMPL(qname_attr, env) \
-      (((axis2_woden_qname_attr_t *) qname_attr)->ops->get_base_impl(qname_attr, \
+#define WODEN_QNAME_ATTR_GET_BASE_IMPL(qname_attr, env) \
+      (((woden_qname_attr_t *) qname_attr)->ops->get_base_impl(qname_attr, \
                                                                         env))
 
-#define AXIS2_WODEN_QNAME_ATTR_GET_QNAME(qname_attr, env) \
-      (((axis2_woden_qname_attr_t *) qname_attr)->ops->get_qname(qname_attr, \
+#define WODEN_QNAME_ATTR_GET_QNAME(qname_attr, env) \
+      (((woden_qname_attr_t *) qname_attr)->ops->get_qname(qname_attr, \
                                                                     env))
 
-#define AXIS2_WODEN_QNAME_ATTR_CONVERT(qname_attr, env) \
-      (((axis2_woden_qname_attr_t *) qname_attr)->ops->convert(qname_attr, \
+#define WODEN_QNAME_ATTR_CONVERT(qname_attr, env) \
+      (((woden_qname_attr_t *) qname_attr)->ops->convert(qname_attr, \
                                                                        env))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_WODEN_QNAME_ATTR_H */
+#endif /* WODEN_QNAME_ATTR_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_qname_list_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_qname_list_attr.h?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_qname_list_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_qname_list_attr.h Tue Jun 13 22:23:14 2006
@@ -14,27 +14,27 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_WODEN_QNAME_LIST_ATTR_H
-#define AXIS2_WODEN_QNAME_LIST_ATTR_H
+#ifndef WODEN_QNAME_LIST_ATTR_H
+#define WODEN_QNAME_LIST_ATTR_H
 
 /**
- * @file axis2_woden_qname_list_attr.h
+ * @file woden_qname_list_attr.h
  * @brief Axis2 QName List Attribute Interface
  *          This class represents XML attribute information items of type 
  *          xs:list of QNames.
  */
 
-#include <woden/axis2_woden.h>
-#include <woden/xml/axis2_woden_xml_attr.h>
+#include <woden/woden.h>
+#include <woden_xml_attr.h>
 #include <axis2_array_list.h>
 
-/** @defgroup axis2_woden_qname_list_attr QName List Attribute
+/** @defgroup woden_qname_list_attr QName List Attribute
   * @ingroup axis2_wsdl
   * @{
   */
 
-typedef struct axis2_woden_qname_list_attr axis2_woden_qname_list_attr_t;
-typedef struct axis2_woden_qname_list_attr_ops axis2_woden_qname_list_attr_ops_t;
+typedef struct woden_qname_list_attr woden_qname_list_attr_t;
+typedef struct woden_qname_list_attr_ops woden_qname_list_attr_ops_t;
 struct axiom_element;
 struct axiom_node;
 
@@ -43,7 +43,7 @@
 {
 #endif
 
-struct axis2_woden_qname_list_attr_ops
+struct woden_qname_list_attr_ops
 {
    /** 
      * Deallocate memory
@@ -59,7 +59,7 @@
             void *qname_list_attr,
             const axis2_env_t *env);
     
-    axis2_woden_obj_types_t (AXIS2_CALL *
+    woden_obj_types_t (AXIS2_CALL *
     type) (
             void *qname_list_attr,
             const axis2_env_t *env);
@@ -67,7 +67,7 @@
     /**
      * @return the base implementation class
      */
-    axis2_woden_xml_attr_t *(AXIS2_CALL *
+    woden_xml_attr_t *(AXIS2_CALL *
     get_base_impl) (
             void *qname_list_attr,
             const axis2_env_t *env);
@@ -104,18 +104,18 @@
   
 };
 
-struct axis2_woden_qname_list_attr
+struct woden_qname_list_attr
 {
-    axis2_woden_xml_attr_t base;
-    axis2_woden_qname_list_attr_ops_t *ops;
+    woden_xml_attr_t base;
+    woden_qname_list_attr_ops_t *ops;
 };
 
 /*
  * 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,
         struct axiom_element *owner_el,
         struct axiom_node *owner_node,
@@ -125,37 +125,37 @@
 
 /************************Woden C Internal Methods******************************/
 AXIS2_EXTERN 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);
 /************************End of Woden C Internal Methods***********************/
 
-#define AXIS2_WODEN_QNAME_LIST_ATTR_FREE(qname_list_attr, env) \
-      (((axis2_woden_qname_list_attr_t *) qname_list_attr)->ops->free(qname_list_attr, env))
+#define WODEN_QNAME_LIST_ATTR_FREE(qname_list_attr, env) \
+      (((woden_qname_list_attr_t *) qname_list_attr)->ops->free(qname_list_attr, env))
 
-#define AXIS2_WODEN_QNAME_LIST_ATTR_TO_QNAME_LIST_ATTR_FREE(qname_list_attr, env) \
-      (((axis2_woden_qname_list_attr_t *) qname_list_attr)->ops->\
+#define WODEN_QNAME_LIST_ATTR_TO_QNAME_LIST_ATTR_FREE(qname_list_attr, env) \
+      (((woden_qname_list_attr_t *) qname_list_attr)->ops->\
          to_qname_list_attr_free(qname_list_attr, env))
 
-#define AXIS2_WODEN_QNAME_LIST_ATTR_TYPE(qname_list_attr, env) \
-      (((axis2_woden_qname_list_attr_t *) qname_list_attr)->ops->\
+#define WODEN_QNAME_LIST_ATTR_TYPE(qname_list_attr, env) \
+      (((woden_qname_list_attr_t *) qname_list_attr)->ops->\
          type(qname_list_attr, env))
 
-#define AXIS2_WODEN_QNAME_LIST_ATTR_GET_BASE_IMPL(qname_list_attr, env) \
-      (((axis2_woden_qname_list_attr_t *) qname_list_attr)->ops->\
+#define WODEN_QNAME_LIST_ATTR_GET_BASE_IMPL(qname_list_attr, env) \
+      (((woden_qname_list_attr_t *) qname_list_attr)->ops->\
          get_base_impl(qname_list_attr, env))
 
-#define AXIS2_WODEN_QNAME_LIST_ATTR_GET_QNAMES(qname_list_attr, env) \
-      (((axis2_woden_qname_list_attr_t *) qname_list_attr)->ops->\
+#define WODEN_QNAME_LIST_ATTR_GET_QNAMES(qname_list_attr, env) \
+      (((woden_qname_list_attr_t *) qname_list_attr)->ops->\
          get_qnames(qname_list_attr, env))
 
-#define AXIS2_WODEN_QNAME_LIST_ATTR_CONVERT(qname_list_attr, env) \
-      (((axis2_woden_qname_list_attr_t *) qname_list_attr)->ops->\
+#define WODEN_QNAME_LIST_ATTR_CONVERT(qname_list_attr, env) \
+      (((woden_qname_list_attr_t *) qname_list_attr)->ops->\
          convert(qname_list_attr, env))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_WODEN_QNAME_LIST_ATTR_H */
+#endif /* WODEN_QNAME_LIST_ATTR_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_qname_list_or_token_any_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_qname_list_or_token_any_attr.h?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_qname_list_or_token_any_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_qname_list_or_token_any_attr.h Tue Jun 13 22:23:14 2006
@@ -14,30 +14,30 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_H
-#define AXIS2_WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_H
+#ifndef WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_H
+#define WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_H
 
 /**
- * @file axis2_woden_qname_list_or_token_any_attr.h
+ * @file woden_qname_list_or_token_any_attr.h
  * @brief Axis2 QName List or Token Any Attribute Interface
  *          This class represents XML attribute information items of type
  * "        Union of list of QName or xs:token #any"
  *          (e.g. the wsoap:subcodes extension attribute of binding fault).
  */
 
-#include <woden/axis2_woden.h>
-#include <woden/xml/axis2_woden_xml_attr.h>
+#include <woden/woden.h>
+#include <woden_xml_attr.h>
 #include <axis2_array_list.h>
 
-/** @defgroup axis2_woden_qname_list_or_token_any_attr QName List or Token Any Attribute
+/** @defgroup woden_qname_list_or_token_any_attr QName List or Token Any Attribute
   * @ingroup axis2_wsdl
   * @{
   */
 
-typedef struct axis2_woden_qname_list_or_token_any_attr 
-        axis2_woden_qname_list_or_token_any_attr_t;
-typedef struct axis2_woden_qname_list_or_token_any_attr_ops 
-        axis2_woden_qname_list_or_token_any_attr_ops_t;
+typedef struct woden_qname_list_or_token_any_attr 
+        woden_qname_list_or_token_any_attr_t;
+typedef struct woden_qname_list_or_token_any_attr_ops 
+        woden_qname_list_or_token_any_attr_ops_t;
 struct axiom_element;
 struct axiom_node;
 
@@ -46,7 +46,7 @@
 {
 #endif
 
-struct axis2_woden_qname_list_or_token_any_attr_ops
+struct woden_qname_list_or_token_any_attr_ops
 {
    /** 
      * Deallocate memory
@@ -62,7 +62,7 @@
             void *list_token_attr,
             const axis2_env_t *env);
     
-    axis2_woden_obj_types_t (AXIS2_CALL *
+    woden_obj_types_t (AXIS2_CALL *
     type) (
             void *list_token_attr,
             const axis2_env_t *env);
@@ -70,7 +70,7 @@
     /**
      * @return the base implementation class
      */
-    axis2_woden_xml_attr_t *(AXIS2_CALL *
+    woden_xml_attr_t *(AXIS2_CALL *
     get_base_impl) (
             void *list_token_attr,
             const axis2_env_t *env);
@@ -120,18 +120,18 @@
 
 };
 
-struct axis2_woden_qname_list_or_token_any_attr
+struct woden_qname_list_or_token_any_attr
 {
-    axis2_woden_xml_attr_t base;
-    axis2_woden_qname_list_or_token_any_attr_ops_t *ops;
+    woden_xml_attr_t base;
+    woden_qname_list_or_token_any_attr_ops_t *ops;
 };
 
 /*
  * 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,
         struct axiom_element *owner_el,
         struct axiom_node *owner_node,
@@ -141,56 +141,56 @@
 
 /************************Woden C Internal Methods******************************/
 AXIS2_EXTERN 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);
 /************************End of Woden C Internal Methods***********************/
 
-#define AXIS2_WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_FREE(list_token_attr, env) \
-      (((axis2_woden_qname_list_or_token_any_attr_t *) \
+#define WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_FREE(list_token_attr, env) \
+      (((woden_qname_list_or_token_any_attr_t *) \
           list_token_attr)->ops->free(list_token_attr, env))
 
-#define AXIS2_WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_TO_QNAME_LIST_OR_TOKEN_ANY_ATTR_FREE(\
+#define WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_TO_QNAME_LIST_OR_TOKEN_ANY_ATTR_FREE(\
         list_token_attr, env) \
-      (((axis2_woden_qname_list_or_token_any_attr_t *) list_token_attr)->ops->\
+      (((woden_qname_list_or_token_any_attr_t *) list_token_attr)->ops->\
          to_qname_list_or_token_any_attr_free(list_token_attr, env))
 
-#define AXIS2_WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_TYPE(list_token_attr, env) \
-      (((axis2_woden_qname_list_or_token_any_attr_t *) list_token_attr)->ops->\
+#define WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_TYPE(list_token_attr, env) \
+      (((woden_qname_list_or_token_any_attr_t *) list_token_attr)->ops->\
          type(list_token_attr, env))
 
-#define AXIS2_WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_GET_BASE_IMPL(list_token_attr, \
+#define WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_GET_BASE_IMPL(list_token_attr, \
         env) \
-      (((axis2_woden_qname_list_or_token_any_attr_t *) \
+      (((woden_qname_list_or_token_any_attr_t *) \
           list_token_attr)->ops->get_base_impl(list_token_attr, \
                                                           env))
 
-#define AXIS2_WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_IS_QNAME_LIST(list_token_attr, \
+#define WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_IS_QNAME_LIST(list_token_attr, \
         env) \
-      (((axis2_woden_qname_list_or_token_any_attr_t *) \
+      (((woden_qname_list_or_token_any_attr_t *) \
           list_token_attr)->ops->is_qname_list(list_token_attr, \
                                                             env))
 
-#define AXIS2_WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_IS_TOKEN(list_token_attr, env) \
-      (((axis2_woden_qname_list_or_token_any_attr_t *) \
+#define WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_IS_TOKEN(list_token_attr, env) \
+      (((woden_qname_list_or_token_any_attr_t *) \
           list_token_attr)->ops->is_token(list_token_attr, \
                                                        env))
 
-#define AXIS2_WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_GET_QNAMES(list_token_attr, \
+#define WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_GET_QNAMES(list_token_attr, \
         env) \
-      (((axis2_woden_qname_list_or_token_any_attr_t *) \
+      (((woden_qname_list_or_token_any_attr_t *) \
           list_token_attr)->ops->get_qnames(list_token_attr, \
                                                          env))
 
-#define AXIS2_WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_GET_TOKEN(list_token_attr, \
+#define WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_GET_TOKEN(list_token_attr, \
         env) \
-      (((axis2_woden_qname_list_or_token_any_attr_t *) \
+      (((woden_qname_list_or_token_any_attr_t *) \
           list_token_attr)->ops->get_token(list_token_attr, \
                                                          env))
 
-#define AXIS2_WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_CONVERT(list_token_attr, env) \
-      (((axis2_woden_qname_list_or_token_any_attr_t *) \
+#define WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_CONVERT(list_token_attr, env) \
+      (((woden_qname_list_or_token_any_attr_t *) \
           list_token_attr)->ops->convert(list_token_attr, \
                                                       env))
 
@@ -198,4 +198,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_H */
+#endif /* WODEN_QNAME_LIST_OR_TOKEN_ANY_ATTR_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_qname_or_token_any_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_qname_or_token_any_attr.h?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_qname_or_token_any_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_qname_or_token_any_attr.h Tue Jun 13 22:23:14 2006
@@ -14,30 +14,30 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_H
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_H
+#ifndef WODEN_QNAME_OR_TOKEN_ANY_ATTR_H
+#define WODEN_QNAME_OR_TOKEN_ANY_ATTR_H
 
 /**
- * @file axis2_woden_qname_or_token_any_attr.h
+ * @file woden_qname_or_token_any_attr.h
  * @brief Axis2 QName or Token Any Attribute Interface
  *          This class represents XML attribute information items of type
  *          "Union of QName or xs:token #any"
  *          (e.g. the wsoap:code extension attribute of binding fault).
  */
 
-#include <woden/axis2_woden.h>
-#include <woden/xml/axis2_woden_xml_attr.h>
+#include <woden/woden.h>
+#include <woden_xml_attr.h>
 #include <axis2_array_list.h>
 
-/** @defgroup axis2_woden_qname_or_token_any_attr QName or Token Any Attribute
+/** @defgroup woden_qname_or_token_any_attr QName or Token Any Attribute
   * @ingroup axis2_wsdl
   * @{
   */
 
-typedef struct axis2_woden_qname_or_token_any_attr 
-        axis2_woden_qname_or_token_any_attr_t;
-typedef struct axis2_woden_qname_or_token_any_attr_ops 
-        axis2_woden_qname_or_token_any_attr_ops_t;
+typedef struct woden_qname_or_token_any_attr 
+        woden_qname_or_token_any_attr_t;
+typedef struct woden_qname_or_token_any_attr_ops 
+        woden_qname_or_token_any_attr_ops_t;
 struct axiom_element;
 struct axiom_node;
 
@@ -46,7 +46,7 @@
 {
 #endif
 
-struct axis2_woden_qname_or_token_any_attr_ops
+struct woden_qname_or_token_any_attr_ops
 {
    /** 
      * Deallocate memory
@@ -62,7 +62,7 @@
             void *token_attr,
             const axis2_env_t *env);
     
-    axis2_woden_obj_types_t (AXIS2_CALL *
+    woden_obj_types_t (AXIS2_CALL *
     type) (
             void *token_attr,
             const axis2_env_t *env);
@@ -70,7 +70,7 @@
     /**
      * @return the base implementation class
      */
-    axis2_woden_xml_attr_t *(AXIS2_CALL *
+    woden_xml_attr_t *(AXIS2_CALL *
     get_base_impl) (
             void *token_attr,
             const axis2_env_t *env);
@@ -120,18 +120,18 @@
 
 };
 
-struct axis2_woden_qname_or_token_any_attr
+struct woden_qname_or_token_any_attr
 {
-    axis2_woden_xml_attr_t base;
-    axis2_woden_qname_or_token_any_attr_ops_t *ops;
+    woden_xml_attr_t base;
+    woden_qname_or_token_any_attr_ops_t *ops;
 };
 
 /*
  * 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(
+AXIS2_EXTERN woden_qname_or_token_any_attr_t * AXIS2_CALL
+woden_qname_or_token_any_attr_create(
         const axis2_env_t *env,
         struct axiom_element *owner_el,
         struct axiom_node *owner_node,
@@ -141,47 +141,47 @@
 
 /************************Woden C Internal Methods******************************/
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_woden_qname_or_token_any_attr_resolve_methods(
-        axis2_woden_qname_or_token_any_attr_t *token_attr,
+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);
 /************************End of Woden C Internal Methods***********************/
 
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_FREE(token_attr, env) \
-      (((axis2_woden_qname_or_token_any_attr_t *) \
+#define WODEN_QNAME_OR_TOKEN_ANY_ATTR_FREE(token_attr, env) \
+      (((woden_qname_or_token_any_attr_t *) \
           token_attr)->ops->free(token_attr, env))
 
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_TYPE(token_attr, env) \
-      (((axis2_woden_qname_or_token_any_attr_t *) token_attr)->ops->\
+#define WODEN_QNAME_OR_TOKEN_ANY_ATTR_TYPE(token_attr, env) \
+      (((woden_qname_or_token_any_attr_t *) token_attr)->ops->\
          type(token_attr, env))
 
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_GET_BASE_IMPL(token_attr, \
+#define WODEN_QNAME_OR_TOKEN_ANY_ATTR_GET_BASE_IMPL(token_attr, \
         env) \
-      (((axis2_woden_qname_or_token_any_attr_t *) token_attr)->ops->\
+      (((woden_qname_or_token_any_attr_t *) token_attr)->ops->\
          get_base_impl(token_attr, env))
 
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_IS_QNAME(token_attr, env) \
-      (((axis2_woden_qname_or_token_any_attr_t *) token_attr)->ops->\
+#define WODEN_QNAME_OR_TOKEN_ANY_ATTR_IS_QNAME(token_attr, env) \
+      (((woden_qname_or_token_any_attr_t *) token_attr)->ops->\
          is_qname(token_attr, env))
 
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_IS_TOKEN(token_attr, env) \
-      (((axis2_woden_qname_or_token_any_attr_t *) \
+#define WODEN_QNAME_OR_TOKEN_ANY_ATTR_IS_TOKEN(token_attr, env) \
+      (((woden_qname_or_token_any_attr_t *) \
           token_attr)->ops->is_token(token_attr, env))
 
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_GET_QNAME(token_attr, env) \
-      (((axis2_woden_qname_or_token_any_attr_t *) token_attr)->ops->\
+#define WODEN_QNAME_OR_TOKEN_ANY_ATTR_GET_QNAME(token_attr, env) \
+      (((woden_qname_or_token_any_attr_t *) token_attr)->ops->\
          get_qname(token_attr, env))
 
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_GET_TOKEN(token_attr, env) \
-      (((axis2_woden_qname_or_token_any_attr_t *) token_attr)->ops->\
+#define WODEN_QNAME_OR_TOKEN_ANY_ATTR_GET_TOKEN(token_attr, env) \
+      (((woden_qname_or_token_any_attr_t *) token_attr)->ops->\
          get_token(token_attr, env))
 
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_CONVERT(token_attr, env) \
-      (((axis2_woden_qname_or_token_any_attr_t *) token_attr)->ops->\
+#define WODEN_QNAME_OR_TOKEN_ANY_ATTR_CONVERT(token_attr, env) \
+      (((woden_qname_or_token_any_attr_t *) token_attr)->ops->\
          convert(token_attr, env))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_H */
+#endif /* WODEN_QNAME_OR_TOKEN_ANY_ATTR_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_reader.h?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_reader.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_reader.h Tue Jun 13 22:23:14 2006
@@ -24,8 +24,8 @@
  * 
  */
 
-#include <woden/axis2_woden.h>
-#include <woden/wsdl20/extensions/axis2_woden_ext_registry.h>
+#include <woden/woden.h>
+#include <woden_ext_registry.h>
 #include <axiom_document.h>
 
 /** @defgroup woden_reader Woden Wsdl Reader
@@ -64,9 +64,9 @@
     set_ext_registry) (
             void *reader,
             const axis2_env_t *env,
-            axis2_woden_ext_registry_t *ext_reg);
+            woden_ext_registry_t *ext_reg);
 
-    axis2_woden_ext_registry_t *(AXIS2_CALL *
+    woden_ext_registry_t *(AXIS2_CALL *
     get_ext_registry) (
             void *reader,
             const axis2_env_t *env);



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


Mime
View raw message