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/07/05 07:41:05 UTC

svn commit: r419167 [2/8] - in /webservices/axis2/trunk/c/woden: include/ samples/wsdl10/ src/builder/wsdl10/ src/wsdl10/ src/wsdl10/extensions/soap/ src/wsdl10/xml/ src/wsdl20/

Modified: webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref.h?rev=419167&r1=419166&r2=419167&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref.h Tue Jul  4 22:41:04 2006
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-#ifndef WODEN_WSDL10_INTERFACE_MSG_REF_H
-#define WODEN_WSDL10_INTERFACE_MSG_REF_H
+#ifndef WODEN_INTERFACE_MSG_REF_H
+#define WODEN_INTERFACE_MSG_REF_H
 
 /**
- * @file woden_wsdl10_interface_msg_ref.h
+ * @file woden_interface_msg_ref.h
  * @brief Axis2 Interface Message Reference Interface Message Reference
  * 
  */
 
 #include <woden.h>
-#include <woden_wsdl10_interface_msg_ref_element.h>
+#include <woden_interface_msg_ref_element.h>
 #include <woden_nested_configurable.h>
 #include <axis2_qname.h>
 
-/** @defgroup woden_wsdl10_interface_msg_ref Interface Message Reference
+/** @defgroup woden_interface_msg_ref Interface Message Reference
   * @ingroup woden
   * @{
   */
 
-typedef union woden_wsdl10_interface_msg_ref_base woden_wsdl10_interface_msg_ref_base_t;
-typedef struct woden_wsdl10_interface_msg_ref woden_wsdl10_interface_msg_ref_t;
-typedef struct woden_wsdl10_interface_msg_ref_ops woden_wsdl10_interface_msg_ref_ops_t;
+typedef union woden_interface_msg_ref_base woden_interface_msg_ref_base_t;
+typedef struct woden_interface_msg_ref woden_interface_msg_ref_t;
+typedef struct woden_interface_msg_ref_ops woden_interface_msg_ref_ops_t;
 
 
 #ifdef __cplusplus
@@ -43,7 +43,7 @@
 {
 #endif
 
-struct woden_wsdl10_interface_msg_ref_ops
+struct woden_interface_msg_ref_ops
 {
    /** 
      * Deallocate memory
@@ -78,106 +78,165 @@
             void *interface_msg_ref,
             const axis2_env_t *env);
 
+    void *(AXIS2_CALL *
+    get_msg_label) (
+            void *interface_msg_ref,
+            const axis2_env_t *env);
+
+    /**
+     * Indicates the type of message content.#any means any single element, 
+     * #none means no message content, #other means non-XML extension type system
+     * or #element means XML Schema global element definition.
+     *   
+     * @return string representing the type of message content
+     */
+    axis2_char_t *(AXIS2_CALL *
+    get_msg_content_model) (
+            void *interface_msg_ref,
+            const axis2_env_t *env);
+
+    void *(AXIS2_CALL *
+    get_element_declaration) (
+            void *interface_msg_ref,
+            const axis2_env_t *env);
+
+/* ************************************************************
+ *  Non-API implementation methods
+ * ************************************************************/
+    axis2_status_t (AXIS2_CALL *
+    set_element_declaration) (
+            void *interface_msg_ref,
+            const axis2_env_t *env,
+            void *element);
+
+    axis2_status_t (AXIS2_CALL *
+    set_types) (
+            void *interface_msg_ref,
+            const axis2_env_t *env,
+            void *types);
+
+
 };
 
-union woden_wsdl10_interface_msg_ref_base
+union woden_interface_msg_ref_base
 {
     woden_nested_configurable_t nested_configurable;
-    woden_wsdl10_interface_msg_ref_element_t interface_msg_ref_element;
+    woden_interface_msg_ref_element_t interface_msg_ref_element;
 };
 
-struct woden_wsdl10_interface_msg_ref
+struct woden_interface_msg_ref
 {
-    woden_wsdl10_interface_msg_ref_base_t base;
-    woden_wsdl10_interface_msg_ref_ops_t *ops;
+    woden_interface_msg_ref_base_t base;
+    woden_interface_msg_ref_ops_t *ops;
 };
 
-AXIS2_EXTERN woden_wsdl10_interface_msg_ref_t * AXIS2_CALL
-woden_wsdl10_interface_msg_ref_create(
+AXIS2_EXTERN woden_interface_msg_ref_t * AXIS2_CALL
+woden_interface_msg_ref_create(
         const axis2_env_t *env);
 
 
 /***************************Woden C Internal Methods***************************/
-AXIS2_EXTERN woden_wsdl10_interface_msg_ref_t * AXIS2_CALL
-woden_wsdl10_interface_msg_ref_to_interface_msg_ref_element(
+AXIS2_EXTERN woden_interface_msg_ref_t * AXIS2_CALL
+woden_interface_msg_ref_to_interface_msg_ref_element(
         void *interface_msg_ref,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_interface_msg_ref_t * AXIS2_CALL
-woden_wsdl10_interface_msg_ref_to_nested_configurable(
+AXIS2_EXTERN woden_interface_msg_ref_t * AXIS2_CALL
+woden_interface_msg_ref_to_nested_configurable(
         void *interface_msg_ref,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_interface_msg_ref_t * AXIS2_CALL
-woden_wsdl10_interface_msg_ref_to_configurable(
+AXIS2_EXTERN woden_interface_msg_ref_t * AXIS2_CALL
+woden_interface_msg_ref_to_configurable(
         void *interface_msg_ref,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_interface_msg_ref_t * AXIS2_CALL
-woden_wsdl10_interface_msg_ref_to_nested_element(
+AXIS2_EXTERN woden_interface_msg_ref_t * AXIS2_CALL
+woden_interface_msg_ref_to_nested_element(
         void *interface_msg_ref,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_interface_msg_ref_t * AXIS2_CALL
-woden_wsdl10_interface_msg_ref_to_configurable_element(
+AXIS2_EXTERN woden_interface_msg_ref_t * AXIS2_CALL
+woden_interface_msg_ref_to_configurable_element(
         void *interface_msg_ref,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_interface_msg_ref_t * AXIS2_CALL
-woden_wsdl10_interface_msg_ref_to_documentable_element(
+AXIS2_EXTERN woden_interface_msg_ref_t * AXIS2_CALL
+woden_interface_msg_ref_to_documentable_element(
         void *interface_msg_ref,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_interface_msg_ref_t * AXIS2_CALL
-woden_wsdl10_interface_msg_ref_to_documentable(
+AXIS2_EXTERN woden_interface_msg_ref_t * AXIS2_CALL
+woden_interface_msg_ref_to_documentable(
         void *interface_msg_ref,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_interface_msg_ref_t * AXIS2_CALL
-woden_wsdl10_interface_msg_ref_to_attr_extensible(
+AXIS2_EXTERN woden_interface_msg_ref_t * AXIS2_CALL
+woden_interface_msg_ref_to_attr_extensible(
         void *interface_msg_ref,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_interface_msg_ref_t * AXIS2_CALL
-woden_wsdl10_interface_msg_ref_to_element_extensible(
+AXIS2_EXTERN woden_interface_msg_ref_t * AXIS2_CALL
+woden_interface_msg_ref_to_element_extensible(
         void *interface_msg_ref,
         const axis2_env_t *env);
 
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-woden_wsdl10_interface_msg_ref_resolve_methods(
-        woden_wsdl10_interface_msg_ref_t *interface_msg_ref,
+woden_interface_msg_ref_resolve_methods(
+        woden_interface_msg_ref_t *interface_msg_ref,
         const axis2_env_t *env,
-        woden_wsdl10_interface_msg_ref_t *interface_msg_ref_impl,
+        woden_interface_msg_ref_t *interface_msg_ref_impl,
         axis2_hash_t *methods);
 /************************End of Woden C Internal Methods***********************/
 
-#define WODEN_WSDL10_INTERFACE_MSG_REF_FREE(interface_msg_ref, env) \
-      (((woden_wsdl10_interface_msg_ref_t *) interface_msg_ref)->ops->\
+#define WODEN_INTERFACE_MSG_REF_FREE(interface_msg_ref, env) \
+      (((woden_interface_msg_ref_t *) interface_msg_ref)->ops->\
        free(interface_msg_ref, env))
 
-#define WODEN_WSDL10_INTERFACE_MSG_REF_SUPER_OBJS(interface_msg_ref, env) \
-      (((woden_wsdl10_interface_msg_ref_t *) interface_msg_ref)->ops->\
+#define WODEN_INTERFACE_MSG_REF_SUPER_OBJS(interface_msg_ref, env) \
+      (((woden_interface_msg_ref_t *) interface_msg_ref)->ops->\
        super_objs(interface_msg_ref, env))
 
-#define WODEN_WSDL10_INTERFACE_MSG_REF_TYPE(interface_msg_ref, env) \
-      (((woden_wsdl10_interface_msg_ref_t *) interface_msg_ref)->ops->\
+#define WODEN_INTERFACE_MSG_REF_TYPE(interface_msg_ref, env) \
+      (((woden_interface_msg_ref_t *) interface_msg_ref)->ops->\
        type(interface_msg_ref, env))
 
-#define WODEN_WSDL10_INTERFACE_MSG_REF_GET_BASE_IMPL(interface_msg_ref, env) \
-      (((woden_wsdl10_interface_msg_ref_t *) interface_msg_ref)->ops->\
+#define WODEN_INTERFACE_MSG_REF_GET_BASE_IMPL(interface_msg_ref, env) \
+      (((woden_interface_msg_ref_t *) interface_msg_ref)->ops->\
        get_base_impl(interface_msg_ref, env))
 
-#define WODEN_WSDL10_INTERFACE_MSG_REF_GET_DIRECTION(interface_msg_ref, env) \
-      (((woden_wsdl10_interface_msg_ref_t *) interface_msg_ref)->ops->\
+#define WODEN_INTERFACE_MSG_REF_GET_DIRECTION(interface_msg_ref, env) \
+      (((woden_interface_msg_ref_t *) interface_msg_ref)->ops->\
          get_direction(interface_msg_ref, env))
 
-#define WODEN_WSDL10_INTERFACE_MSG_REF_TO_ELEMENT(interface_msg_ref, env) \
-      (((woden_wsdl10_interface_msg_ref_t *) interface_msg_ref)->ops->\
+#define WODEN_INTERFACE_MSG_REF_TO_ELEMENT(interface_msg_ref, env) \
+      (((woden_interface_msg_ref_t *) interface_msg_ref)->ops->\
          to_element(interface_msg_ref, env))
 
+#define WODEN_INTERFACE_MSG_REF_GET_MESSAGE_LABEL(interface_msg_ref, env) \
+      (((woden_interface_msg_ref_t *) interface_msg_ref)->ops->\
+         get_msg_label(interface_msg_ref, env))
+
+#define WODEN_INTERFACE_MSG_REF_GET_MSG_CONTENT_MODEL(interface_msg_ref, env) \
+      (((woden_interface_msg_ref_t *) interface_msg_ref)->ops->\
+         get_msg_content_model(interface_msg_ref, env))
+
+#define WODEN_INTERFACE_MSG_REF_GET_ELEMENT_DECLARATION(interface_msg_ref, env) \
+      (((woden_interface_msg_ref_t *) interface_msg_ref)->ops->\
+         get_element_declaration(interface_msg_ref, env))
+
+#define WODEN_INTERFACE_MSG_REF_SET_ELEMENT_DECLARATION(interface_msg_ref, env, element) \
+      (((woden_interface_msg_ref_t *) interface_msg_ref)->ops->\
+         set_element_declaration(interface_msg_ref, env, element))
+
+#define WODEN_INTERFACE_MSG_REF_SET_TYPES(interface_msg_ref, env, types) \
+      (((woden_interface_msg_ref_t *) interface_msg_ref)->ops->\
+         set_types(interface_msg_ref, env, types))
+
+
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* WODEN_WSDL10_INTERFACE_MSG_REF_H */
+#endif /* WODEN_INTERFACE_MSG_REF_H */

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=419167&r1=419166&r2=419167&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 Jul  4 22:41:04 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_H
-#define WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_H
+#ifndef WODEN_INTERFACE_MSG_REF_ELEMENT_H
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_H
 
 /**
- * @file woden_wsdl10_interface_msg_ref_element.h
+ * @file woden_interface_msg_ref_element.h
  * @brief Axis2 Interface Msg Reference Element Interface
  * This interface represents the &lt;input&gt; and &lt;output&gt; 
  * child elements of interface operation. 
@@ -43,16 +43,16 @@
 {
 #endif
 
-typedef struct woden_wsdl10_interface_msg_ref_element woden_wsdl10_interface_msg_ref_element_t;
-typedef struct woden_wsdl10_interface_msg_ref_element_ops woden_wsdl10_interface_msg_ref_element_ops_t;
-typedef union woden_wsdl10_interface_msg_ref_element_base woden_wsdl10_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 woden_wsdl10_interface_msg_ref_element Interface Msg Reference Element
+/** @defgroup woden_interface_msg_ref_element Interface Msg Reference Element
   * @ingroup axis2_interface
   * @{
   */
 
-struct woden_wsdl10_interface_msg_ref_element_ops
+struct woden_interface_msg_ref_element_ops
 {
    /** 
      * Deallocate memory
@@ -112,74 +112,156 @@
             void *iface_fault_ele,
             const axis2_env_t *env);
     
+    axis2_status_t (AXIS2_CALL *
+    set_msg_label) (
+            void *iface_fault_ele,
+            const axis2_env_t *env,
+            void *msg_label);
+
+    void *(AXIS2_CALL *
+    get_msg_label) (
+            void *iface_fault_ele,
+            const axis2_env_t *env);
+ 
+    axis2_status_t (AXIS2_CALL *
+    set_msg_content_model) (
+            void *iface_fault_ele,
+            const axis2_env_t *env,
+            axis2_char_t *nm_token);
+    
+    axis2_char_t *(AXIS2_CALL *
+    get_msg_content_model) (
+            void *iface_fault_ele,
+            const axis2_env_t *env);
+ 
+    /**
+     * Set the QName that represents the 'element' attribute of the interface 
+     * operation &lt;input&gt; or &lt;output&gt; element. This identifies a Schema 
+     * element declaration.
+     * 
+     * @param qname the QName that identifies a Schema element declaration
+     */
+    axis2_status_t (AXIS2_CALL *
+    set_element_qname) (
+            void *iface_fault_ele,
+            const axis2_env_t *env,
+            axis2_qname_t *element);
+
+    axis2_qname_t *(AXIS2_CALL *
+    get_element_qname) (
+            void *iface_fault_ele,
+            const axis2_env_t *env);
+    
+    /**
+     * Returns the Schema element declaration identified by the QName in the 'element' 
+     * attribute of the interface operation &lt;input&gt; or &lt;output&gt;  element. 
+     * If this QName does not resolve to an element declaration in a schema that is visible 
+     * to the containing WSDL description, null will be returned by this method. 
+     * To be visible, the Schema must have been correctly imported or inlined within 
+     * the &lt;types&gt; element.
+     * 
+     * @return the XmlSchemaElement identified by the 'element' attribute
+     */
+    void *(AXIS2_CALL *
+    get_element) (
+            void *iface_fault_ele,
+            const axis2_env_t *env);
+    
 
 };
 
-union woden_wsdl10_interface_msg_ref_element_base
+union woden_interface_msg_ref_element_base
 {
     woden_documentable_element_t documentable_element;
     woden_configurable_element_t configurable_element;
     woden_nested_element_t nested_element;
 };
 
-struct woden_wsdl10_interface_msg_ref_element
+struct woden_interface_msg_ref_element
 {
-    woden_wsdl10_interface_msg_ref_element_base_t base;
-    woden_wsdl10_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 woden_wsdl10_interface_msg_ref_element_t * AXIS2_CALL
-woden_wsdl10_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
-woden_wsdl10_interface_msg_ref_element_resolve_methods(
-        woden_wsdl10_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 WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_FREE(interface_msg_ref_element, env) \
-      (((woden_wsdl10_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 WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_TYPE(interface_msg_ref_element, env) \
-      (((woden_wsdl10_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 WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_SET_QNAME(interface_msg_ref_element, env, qname) \
-      (((woden_wsdl10_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_SET_QNAME(interface_msg_ref_element, env, qname) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
         set_qname  (interface_msg_ref_element, env, qname))
 
-#define WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_GET_QNAME(interface_msg_ref_element, env) \
-      (((woden_wsdl10_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_GET_QNAME(interface_msg_ref_element, env) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
         get_qname  (interface_msg_ref_element, env))
 
-#define WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_SET_MSG(interface_msg_ref_element, env, msg) \
-      (((woden_wsdl10_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_SET_MSG(interface_msg_ref_element, env, msg) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
         set_msg  (interface_msg_ref_element, env, msg))
 
-#define WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_GET_MSG(interface_msg_ref_element, env) \
-      (((woden_wsdl10_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_GET_MSG(interface_msg_ref_element, env) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
         get_msg  (interface_msg_ref_element, env))
 
-#define WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_SET_MSG_QNAME(interface_msg_ref_element, env, element) \
-      (((woden_wsdl10_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_SET_MSG_QNAME(interface_msg_ref_element, env, element) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
         set_msg_qname  (interface_msg_ref_element, env, element))
 
-#define WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_GET_MSG_QNAME(interface_msg_ref_element, env) \
-      (((woden_wsdl10_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
+#define WODEN_INTERFACE_MSG_REF_ELEMENT_GET_MSG_QNAME(interface_msg_ref_element, env) \
+      (((woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\
         get_msg_qname  (interface_msg_ref_element, env))
 
-#define WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_SET_DIRECTION(interface_msg_ref_element, env, dir) \
-      (((woden_wsdl10_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 WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_GET_DIRECTION(interface_msg_ref_element, env) \
-      (((woden_wsdl10_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))
 
+#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 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 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 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 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 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 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))
 
 
 
@@ -187,4 +269,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_H */
+#endif /* WODEN_INTERFACE_MSG_REF_ELEMENT_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_msg_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_msg_ref.h?rev=419167&r1=419166&r2=419167&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_msg_ref.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_msg_ref.h Tue Jul  4 22:41:04 2006
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-#ifndef WODEN_WSDL10_MSG_REF_H
-#define WODEN_WSDL10_MSG_REF_H
+#ifndef WODEN_MSG_REF_H
+#define WODEN_MSG_REF_H
 
 /**
- * @file woden_wsdl10_msg_ref.h
+ * @file woden_msg_ref.h
  * @brief Axis2 Interface Message Reference Interface Message Reference
  * 
  */
 
 #include <woden.h>
-#include <woden_wsdl10_msg_ref_element.h>
+#include <woden_msg_ref_element.h>
 #include <woden_nested_configurable.h>
 #include <axis2_qname.h>
 
-/** @defgroup woden_wsdl10_msg_ref Interface Message Reference
+/** @defgroup woden_msg_ref Interface Message Reference
   * @ingroup woden
   * @{
   */
 
-typedef union woden_wsdl10_msg_ref_base woden_wsdl10_msg_ref_base_t;
-typedef struct woden_wsdl10_msg_ref woden_wsdl10_msg_ref_t;
-typedef struct woden_wsdl10_msg_ref_ops woden_wsdl10_msg_ref_ops_t;
+typedef union woden_msg_ref_base woden_msg_ref_base_t;
+typedef struct woden_msg_ref woden_msg_ref_t;
+typedef struct woden_msg_ref_ops woden_msg_ref_ops_t;
 
 
 #ifdef __cplusplus
@@ -43,7 +43,7 @@
 {
 #endif
 
-struct woden_wsdl10_msg_ref_ops
+struct woden_msg_ref_ops
 {
    /** 
      * Deallocate memory
@@ -80,104 +80,104 @@
 
 };
 
-union woden_wsdl10_msg_ref_base
+union woden_msg_ref_base
 {
     woden_nested_configurable_t nested_configurable;
-    woden_wsdl10_msg_ref_element_t msg_ref_element;
+    woden_msg_ref_element_t msg_ref_element;
 };
 
-struct woden_wsdl10_msg_ref
+struct woden_msg_ref
 {
-    woden_wsdl10_msg_ref_base_t base;
-    woden_wsdl10_msg_ref_ops_t *ops;
+    woden_msg_ref_base_t base;
+    woden_msg_ref_ops_t *ops;
 };
 
-AXIS2_EXTERN woden_wsdl10_msg_ref_t * AXIS2_CALL
-woden_wsdl10_msg_ref_create(
+AXIS2_EXTERN woden_msg_ref_t * AXIS2_CALL
+woden_msg_ref_create(
         const axis2_env_t *env);
 
 
 /***************************Woden C Internal Methods***************************/
-AXIS2_EXTERN woden_wsdl10_msg_ref_t * AXIS2_CALL
-woden_wsdl10_msg_ref_to_msg_ref_element(
+AXIS2_EXTERN woden_msg_ref_t * AXIS2_CALL
+woden_msg_ref_to_msg_ref_element(
         void *msg_ref,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_msg_ref_t * AXIS2_CALL
-woden_wsdl10_msg_ref_to_nested_configurable(
+AXIS2_EXTERN woden_msg_ref_t * AXIS2_CALL
+woden_msg_ref_to_nested_configurable(
         void *msg_ref,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_msg_ref_t * AXIS2_CALL
-woden_wsdl10_msg_ref_to_configurable(
+AXIS2_EXTERN woden_msg_ref_t * AXIS2_CALL
+woden_msg_ref_to_configurable(
         void *msg_ref,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_msg_ref_t * AXIS2_CALL
-woden_wsdl10_msg_ref_to_nested_element(
+AXIS2_EXTERN woden_msg_ref_t * AXIS2_CALL
+woden_msg_ref_to_nested_element(
         void *msg_ref,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_msg_ref_t * AXIS2_CALL
-woden_wsdl10_msg_ref_to_configurable_element(
+AXIS2_EXTERN woden_msg_ref_t * AXIS2_CALL
+woden_msg_ref_to_configurable_element(
         void *msg_ref,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_msg_ref_t * AXIS2_CALL
-woden_wsdl10_msg_ref_to_documentable_element(
+AXIS2_EXTERN woden_msg_ref_t * AXIS2_CALL
+woden_msg_ref_to_documentable_element(
         void *msg_ref,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_msg_ref_t * AXIS2_CALL
-woden_wsdl10_msg_ref_to_documentable(
+AXIS2_EXTERN woden_msg_ref_t * AXIS2_CALL
+woden_msg_ref_to_documentable(
         void *msg_ref,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_msg_ref_t * AXIS2_CALL
-woden_wsdl10_msg_ref_to_attr_extensible(
+AXIS2_EXTERN woden_msg_ref_t * AXIS2_CALL
+woden_msg_ref_to_attr_extensible(
         void *msg_ref,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_msg_ref_t * AXIS2_CALL
-woden_wsdl10_msg_ref_to_element_extensible(
+AXIS2_EXTERN woden_msg_ref_t * AXIS2_CALL
+woden_msg_ref_to_element_extensible(
         void *msg_ref,
         const axis2_env_t *env);
 
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-woden_wsdl10_msg_ref_resolve_methods(
-        woden_wsdl10_msg_ref_t *msg_ref,
+woden_msg_ref_resolve_methods(
+        woden_msg_ref_t *msg_ref,
         const axis2_env_t *env,
-        woden_wsdl10_msg_ref_t *msg_ref_impl,
+        woden_msg_ref_t *msg_ref_impl,
         axis2_hash_t *methods);
 /************************End of Woden C Internal Methods***********************/
 
-#define WODEN_WSDL10_MSG_REF_FREE(msg_ref, env) \
-      (((woden_wsdl10_msg_ref_t *) msg_ref)->ops->\
+#define WODEN_MSG_REF_FREE(msg_ref, env) \
+      (((woden_msg_ref_t *) msg_ref)->ops->\
        free(msg_ref, env))
 
-#define WODEN_WSDL10_MSG_REF_SUPER_OBJS(msg_ref, env) \
-      (((woden_wsdl10_msg_ref_t *) msg_ref)->ops->\
+#define WODEN_MSG_REF_SUPER_OBJS(msg_ref, env) \
+      (((woden_msg_ref_t *) msg_ref)->ops->\
        super_objs(msg_ref, env))
 
-#define WODEN_WSDL10_MSG_REF_TYPE(msg_ref, env) \
-      (((woden_wsdl10_msg_ref_t *) msg_ref)->ops->\
+#define WODEN_MSG_REF_TYPE(msg_ref, env) \
+      (((woden_msg_ref_t *) msg_ref)->ops->\
        type(msg_ref, env))
 
-#define WODEN_WSDL10_MSG_REF_GET_BASE_IMPL(msg_ref, env) \
-      (((woden_wsdl10_msg_ref_t *) msg_ref)->ops->\
+#define WODEN_MSG_REF_GET_BASE_IMPL(msg_ref, env) \
+      (((woden_msg_ref_t *) msg_ref)->ops->\
        get_base_impl(msg_ref, env))
 
-#define WODEN_WSDL10_MSG_REF_GET_QNAME(msg_ref, env) \
-      (((woden_wsdl10_msg_ref_t *) msg_ref)->ops->\
+#define WODEN_MSG_REF_GET_QNAME(msg_ref, env) \
+      (((woden_msg_ref_t *) msg_ref)->ops->\
          get_qname(msg_ref, env))
 
-#define WODEN_WSDL10_MSG_REF_TO_ELEMENT(msg_ref, env) \
-      (((woden_wsdl10_msg_ref_t *) msg_ref)->ops->\
+#define WODEN_MSG_REF_TO_ELEMENT(msg_ref, env) \
+      (((woden_msg_ref_t *) msg_ref)->ops->\
          to_element(msg_ref, env))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* WODEN_WSDL10_MSG_REF_H */
+#endif /* WODEN_MSG_REF_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_msg_ref_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_msg_ref_element.h?rev=419167&r1=419166&r2=419167&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_msg_ref_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_msg_ref_element.h Tue Jul  4 22:41:04 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef WODEN_WSDL10_MSG_REF_ELEMENT_H
-#define WODEN_WSDL10_MSG_REF_ELEMENT_H
+#ifndef WODEN_MSG_REF_ELEMENT_H
+#define WODEN_MSG_REF_ELEMENT_H
 
 /**
- * @file woden_wsdl10_msg_ref_element.h
+ * @file woden_msg_ref_element.h
  * @brief Axis2 Interface Msg Reference Element Interface
  * This interface represents the &lt;input&gt; and &lt;output&gt; 
  * child elements of interface operation. 
@@ -43,16 +43,16 @@
 {
 #endif
 
-typedef struct woden_wsdl10_msg_ref_element woden_wsdl10_msg_ref_element_t;
-typedef struct woden_wsdl10_msg_ref_element_ops woden_wsdl10_msg_ref_element_ops_t;
-typedef union woden_wsdl10_msg_ref_element_base woden_wsdl10_msg_ref_element_base_t;
+typedef struct woden_msg_ref_element woden_msg_ref_element_t;
+typedef struct woden_msg_ref_element_ops woden_msg_ref_element_ops_t;
+typedef union woden_msg_ref_element_base woden_msg_ref_element_base_t;
 
-/** @defgroup woden_wsdl10_msg_ref_element Interface Msg Reference Element
+/** @defgroup woden_msg_ref_element Interface Msg Reference Element
   * @ingroup axis2_interface
   * @{
   */
 
-struct woden_wsdl10_msg_ref_element_ops
+struct woden_msg_ref_element_ops
 {
    /** 
      * Deallocate memory
@@ -97,57 +97,57 @@
     
 };
 
-union woden_wsdl10_msg_ref_element_base
+union woden_msg_ref_element_base
 {
     woden_documentable_element_t documentable_element;
     woden_configurable_element_t configurable_element;
     woden_nested_element_t nested_element;
 };
 
-struct woden_wsdl10_msg_ref_element
+struct woden_msg_ref_element
 {
-    woden_wsdl10_msg_ref_element_base_t base;
-    woden_wsdl10_msg_ref_element_ops_t *ops;
+    woden_msg_ref_element_base_t base;
+    woden_msg_ref_element_ops_t *ops;
 };
 
-AXIS2_EXTERN woden_wsdl10_msg_ref_element_t * AXIS2_CALL
-woden_wsdl10_msg_ref_element_create(
+AXIS2_EXTERN woden_msg_ref_element_t * AXIS2_CALL
+woden_msg_ref_element_create(
         const axis2_env_t *env);
 
 /************************Woden C Internal Methods******************************/
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-woden_wsdl10_msg_ref_element_resolve_methods(
-        woden_wsdl10_msg_ref_element_t *msg_ref_element,
+woden_msg_ref_element_resolve_methods(
+        woden_msg_ref_element_t *msg_ref_element,
         const axis2_env_t *env,
         axis2_hash_t *methods);
 /************************End of Woden C Internal Methods***********************/
 
-#define WODEN_WSDL10_MSG_REF_ELEMENT_FREE(msg_ref_element, env) \
-      (((woden_wsdl10_msg_ref_element_t *) msg_ref_element)->ops->\
+#define WODEN_MSG_REF_ELEMENT_FREE(msg_ref_element, env) \
+      (((woden_msg_ref_element_t *) msg_ref_element)->ops->\
          free (msg_ref_element, env))
 
-#define WODEN_WSDL10_MSG_REF_ELEMENT_TYPE(msg_ref_element, env) \
-      (((woden_wsdl10_msg_ref_element_t *) msg_ref_element)->ops->\
+#define WODEN_MSG_REF_ELEMENT_TYPE(msg_ref_element, env) \
+      (((woden_msg_ref_element_t *) msg_ref_element)->ops->\
          type (msg_ref_element, env))
 
-#define WODEN_WSDL10_MSG_REF_ELEMENT_SET_PART(msg_ref_element, env, part) \
-      (((woden_wsdl10_msg_ref_element_t *) msg_ref_element)->ops->\
+#define WODEN_MSG_REF_ELEMENT_SET_PART(msg_ref_element, env, part) \
+      (((woden_msg_ref_element_t *) msg_ref_element)->ops->\
          set_part (msg_ref_element, env, part))
 
-#define WODEN_WSDL10_MSG_REF_ELEMENT_GET_PART(msg_ref_element, env) \
-      (((woden_wsdl10_msg_ref_element_t *) msg_ref_element)->ops->\
+#define WODEN_MSG_REF_ELEMENT_GET_PART(msg_ref_element, env) \
+      (((woden_msg_ref_element_t *) msg_ref_element)->ops->\
         get_part  (msg_ref_element, env))
 
-#define WODEN_WSDL10_MSG_REF_ELEMENT_GET_MSG_CONTENT_MODEL(msg_ref_element, env) \
-      (((woden_wsdl10_msg_ref_element_t *) msg_ref_element)->ops->\
+#define WODEN_MSG_REF_ELEMENT_GET_MSG_CONTENT_MODEL(msg_ref_element, env) \
+      (((woden_msg_ref_element_t *) msg_ref_element)->ops->\
         get_msg_content_model  (msg_ref_element, env))
 
-#define WODEN_WSDL10_MSG_REF_ELEMENT_SET_QNAME(msg_ref_element, env, element) \
-      (((woden_wsdl10_msg_ref_element_t *) msg_ref_element)->ops->\
+#define WODEN_MSG_REF_ELEMENT_SET_QNAME(msg_ref_element, env, element) \
+      (((woden_msg_ref_element_t *) msg_ref_element)->ops->\
         set_qname  (msg_ref_element, env, element))
 
-#define WODEN_WSDL10_MSG_REF_ELEMENT_GET_QNAME(msg_ref_element, env) \
-      (((woden_wsdl10_msg_ref_element_t *) msg_ref_element)->ops->\
+#define WODEN_MSG_REF_ELEMENT_GET_QNAME(msg_ref_element, env) \
+      (((woden_msg_ref_element_t *) msg_ref_element)->ops->\
         get_qname  (msg_ref_element, env))
 
 
@@ -155,4 +155,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* WODEN_WSDL10_MSG_REF_ELEMENT_H */
+#endif /* WODEN_MSG_REF_ELEMENT_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_part.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_part.h?rev=419167&r1=419166&r2=419167&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_part.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_part.h Tue Jul  4 22:41:04 2006
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-#ifndef WODEN_WSDL10_PART_H
-#define WODEN_WSDL10_PART_H
+#ifndef WODEN_PART_H
+#define WODEN_PART_H
 
 /**
- * @file woden_wsdl10_part.h
+ * @file woden_part.h
  * @brief Woden Part Interface Message Reference
  * 
  */
 
 #include <woden.h>
-#include <woden_wsdl10_part_element.h>
+#include <woden_part_element.h>
 #include <woden_nested_configurable.h>
 #include <axis2_qname.h>
 
-/** @defgroup woden_wsdl10_part Interface Message Reference
+/** @defgroup woden_part Interface Message Reference
   * @ingroup woden
   * @{
   */
 
-typedef union woden_wsdl10_part_base woden_wsdl10_part_base_t;
-typedef struct woden_wsdl10_part woden_wsdl10_part_t;
-typedef struct woden_wsdl10_part_ops woden_wsdl10_part_ops_t;
+typedef union woden_part_base woden_part_base_t;
+typedef struct woden_part woden_part_t;
+typedef struct woden_part_ops woden_part_ops_t;
 
 
 #ifdef __cplusplus
@@ -43,7 +43,7 @@
 {
 #endif
 
-struct woden_wsdl10_part_ops
+struct woden_part_ops
 {
    /** 
      * Deallocate memory
@@ -99,116 +99,116 @@
             void *types);
 };
 
-union woden_wsdl10_part_base
+union woden_part_base
 {
     woden_nested_configurable_t nested_configurable;
-    woden_wsdl10_part_element_t part_element;
+    woden_part_element_t part_element;
 };
 
-struct woden_wsdl10_part
+struct woden_part
 {
-    woden_wsdl10_part_base_t base;
-    woden_wsdl10_part_ops_t *ops;
+    woden_part_base_t base;
+    woden_part_ops_t *ops;
 };
 
-AXIS2_EXTERN woden_wsdl10_part_t * AXIS2_CALL
-woden_wsdl10_part_create(
+AXIS2_EXTERN woden_part_t * AXIS2_CALL
+woden_part_create(
         const axis2_env_t *env);
 
 
 /***************************Woden C Internal Methods***************************/
-AXIS2_EXTERN woden_wsdl10_part_t * AXIS2_CALL
-woden_wsdl10_part_to_part_element(
+AXIS2_EXTERN woden_part_t * AXIS2_CALL
+woden_part_to_part_element(
         void *part,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_part_t * AXIS2_CALL
-woden_wsdl10_part_to_nested_configurable(
+AXIS2_EXTERN woden_part_t * AXIS2_CALL
+woden_part_to_nested_configurable(
         void *part,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_part_t * AXIS2_CALL
-woden_wsdl10_part_to_configurable(
+AXIS2_EXTERN woden_part_t * AXIS2_CALL
+woden_part_to_configurable(
         void *part,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_part_t * AXIS2_CALL
-woden_wsdl10_part_to_nested_element(
+AXIS2_EXTERN woden_part_t * AXIS2_CALL
+woden_part_to_nested_element(
         void *part,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_part_t * AXIS2_CALL
-woden_wsdl10_part_to_configurable_element(
+AXIS2_EXTERN woden_part_t * AXIS2_CALL
+woden_part_to_configurable_element(
         void *part,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_part_t * AXIS2_CALL
-woden_wsdl10_part_to_documentable_element(
+AXIS2_EXTERN woden_part_t * AXIS2_CALL
+woden_part_to_documentable_element(
         void *part,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_part_t * AXIS2_CALL
-woden_wsdl10_part_to_documentable(
+AXIS2_EXTERN woden_part_t * AXIS2_CALL
+woden_part_to_documentable(
         void *part,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_part_t * AXIS2_CALL
-woden_wsdl10_part_to_attr_extensible(
+AXIS2_EXTERN woden_part_t * AXIS2_CALL
+woden_part_to_attr_extensible(
         void *part,
         const axis2_env_t *env);
 
-AXIS2_EXTERN woden_wsdl10_part_t * AXIS2_CALL
-woden_wsdl10_part_to_element_extensible(
+AXIS2_EXTERN woden_part_t * AXIS2_CALL
+woden_part_to_element_extensible(
         void *part,
         const axis2_env_t *env);
 
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-woden_wsdl10_part_resolve_methods(
-        woden_wsdl10_part_t *part,
+woden_part_resolve_methods(
+        woden_part_t *part,
         const axis2_env_t *env,
-        woden_wsdl10_part_t *part_impl,
+        woden_part_t *part_impl,
         axis2_hash_t *methods);
 /************************End of Woden C Internal Methods***********************/
 
-#define WODEN_WSDL10_PART_FREE(part, env) \
-      (((woden_wsdl10_part_t *) part)->ops->\
+#define WODEN_PART_FREE(part, env) \
+      (((woden_part_t *) part)->ops->\
        free(part, env))
 
-#define WODEN_WSDL10_PART_SUPER_OBJS(part, env) \
-      (((woden_wsdl10_part_t *) part)->ops->\
+#define WODEN_PART_SUPER_OBJS(part, env) \
+      (((woden_part_t *) part)->ops->\
        super_objs(part, env))
 
-#define WODEN_WSDL10_PART_TYPE(part, env) \
-      (((woden_wsdl10_part_t *) part)->ops->\
+#define WODEN_PART_TYPE(part, env) \
+      (((woden_part_t *) part)->ops->\
        type(part, env))
 
-#define WODEN_WSDL10_PART_GET_BASE_IMPL(part, env) \
-      (((woden_wsdl10_part_t *) part)->ops->\
+#define WODEN_PART_GET_BASE_IMPL(part, env) \
+      (((woden_part_t *) part)->ops->\
        get_base_impl(part, env))
 
-#define WODEN_WSDL10_PART_GET_QNAME(part, env) \
-      (((woden_wsdl10_part_t *) part)->ops->\
+#define WODEN_PART_GET_QNAME(part, env) \
+      (((woden_part_t *) part)->ops->\
          get_qname(part, env))
 
-#define WODEN_WSDL10_PART_GET_ELEMENT_DECLARATION(part, env) \
-      (((woden_wsdl10_part_t *) part)->ops->\
+#define WODEN_PART_GET_ELEMENT_DECLARATION(part, env) \
+      (((woden_part_t *) part)->ops->\
          get_element_declaration(part, env))
 
-#define WODEN_WSDL10_PART_TO_ELEMENT(part, env) \
-      (((woden_wsdl10_part_t *) part)->ops->\
+#define WODEN_PART_TO_ELEMENT(part, env) \
+      (((woden_part_t *) part)->ops->\
          to_element(part, env))
 
-#define WODEN_WSDL10_PART_SET_ELEMENT_DECLARATION(part, env, element) \
-      (((woden_wsdl10_part_t *) part)->ops->\
+#define WODEN_PART_SET_ELEMENT_DECLARATION(part, env, element) \
+      (((woden_part_t *) part)->ops->\
          set_element_declaration(part, env, element))
 
-#define WODEN_WSDL10_PART_SET_TYPES(part, env, types) \
-      (((woden_wsdl10_part_t *) part)->ops->\
+#define WODEN_PART_SET_TYPES(part, env, types) \
+      (((woden_part_t *) part)->ops->\
          set_types(part, env, types))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* WODEN_WSDL10_PART_H */
+#endif /* WODEN_PART_H */

Modified: webservices/axis2/trunk/c/woden/include/woden_part_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_part_element.h?rev=419167&r1=419166&r2=419167&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_part_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_part_element.h Tue Jul  4 22:41:04 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef WODEN_WSDL10_PART_ELEMENT_H
-#define WODEN_WSDL10_PART_ELEMENT_H
+#ifndef WODEN_PART_ELEMENT_H
+#define WODEN_PART_ELEMENT_H
 
 /**
- * @file woden_wsdl10_part_element.h
+ * @file woden_part_element.h
  * @brief Axis2 Interface Msg Reference Element Interface
  * This interface represents the &lt;input&gt; and &lt;output&gt; 
  * child elements of interface operation. 
@@ -43,16 +43,16 @@
 {
 #endif
 
-typedef struct woden_wsdl10_part_element woden_wsdl10_part_element_t;
-typedef struct woden_wsdl10_part_element_ops woden_wsdl10_part_element_ops_t;
-typedef union woden_wsdl10_part_element_base woden_wsdl10_part_element_base_t;
+typedef struct woden_part_element woden_part_element_t;
+typedef struct woden_part_element_ops woden_part_element_ops_t;
+typedef union woden_part_element_base woden_part_element_base_t;
 
-/** @defgroup woden_wsdl10_part_element Interface Msg Reference Element
+/** @defgroup woden_part_element Interface Msg Reference Element
   * @ingroup axis2_interface
   * @{
   */
 
-struct woden_wsdl10_part_element_ops
+struct woden_part_element_ops
 {
    /** 
      * Deallocate memory
@@ -115,57 +115,57 @@
 
 };
 
-union woden_wsdl10_part_element_base
+union woden_part_element_base
 {
     woden_documentable_element_t documentable_element;
     woden_configurable_element_t configurable_element;
     woden_nested_element_t nested_element;
 };
 
-struct woden_wsdl10_part_element
+struct woden_part_element
 {
-    woden_wsdl10_part_element_base_t base;
-    woden_wsdl10_part_element_ops_t *ops;
+    woden_part_element_base_t base;
+    woden_part_element_ops_t *ops;
 };
 
-AXIS2_EXTERN woden_wsdl10_part_element_t * AXIS2_CALL
-woden_wsdl10_part_element_create(
+AXIS2_EXTERN woden_part_element_t * AXIS2_CALL
+woden_part_element_create(
         const axis2_env_t *env);
 
 /************************Woden C Internal Methods******************************/
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-woden_wsdl10_part_element_resolve_methods(
-        woden_wsdl10_part_element_t *part_element,
+woden_part_element_resolve_methods(
+        woden_part_element_t *part_element,
         const axis2_env_t *env,
         axis2_hash_t *methods);
 /************************End of Woden C Internal Methods***********************/
 
-#define WODEN_WSDL10_PART_ELEMENT_FREE(part_element, env) \
-      (((woden_wsdl10_part_element_t *) part_element)->ops->\
+#define WODEN_PART_ELEMENT_FREE(part_element, env) \
+      (((woden_part_element_t *) part_element)->ops->\
          free (part_element, env))
 
-#define WODEN_WSDL10_PART_ELEMENT_TYPE(part_element, env) \
-      (((woden_wsdl10_part_element_t *) part_element)->ops->\
+#define WODEN_PART_ELEMENT_TYPE(part_element, env) \
+      (((woden_part_element_t *) part_element)->ops->\
          type (part_element, env))
 
-#define WODEN_WSDL10_PART_ELEMENT_SET_ELEMENT_QNAME(part_element, env, element) \
-      (((woden_wsdl10_part_element_t *) part_element)->ops->\
+#define WODEN_PART_ELEMENT_SET_ELEMENT_QNAME(part_element, env, element) \
+      (((woden_part_element_t *) part_element)->ops->\
         set_element_qname  (part_element, env, element))
 
-#define WODEN_WSDL10_PART_ELEMENT_GET_ELEMENT_QNAME(part_element, env) \
-      (((woden_wsdl10_part_element_t *) part_element)->ops->\
+#define WODEN_PART_ELEMENT_GET_ELEMENT_QNAME(part_element, env) \
+      (((woden_part_element_t *) part_element)->ops->\
         get_element_qname  (part_element, env))
 
-#define WODEN_WSDL10_PART_ELEMENT_GET_ELEMENT(part_element, env) \
-      (((woden_wsdl10_part_element_t *) part_element)->ops->\
+#define WODEN_PART_ELEMENT_GET_ELEMENT(part_element, env) \
+      (((woden_part_element_t *) part_element)->ops->\
         get_element  (part_element, env))
 
-#define WODEN_WSDL10_PART_ELEMENT_SET_QNAME(part_element, env, qname) \
-      (((woden_wsdl10_part_element_t *) part_element)->ops->\
+#define WODEN_PART_ELEMENT_SET_QNAME(part_element, env, qname) \
+      (((woden_part_element_t *) part_element)->ops->\
          set_qname (part_element, env, qname))
 
-#define WODEN_WSDL10_PART_ELEMENT_GET_QNAME(part_element, env) \
-      (((woden_wsdl10_part_element_t *) part_element)->ops->\
+#define WODEN_PART_ELEMENT_GET_QNAME(part_element, env) \
+      (((woden_part_element_t *) part_element)->ops->\
          get_qname (part_element, env))
 
 
@@ -175,4 +175,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* WODEN_WSDL10_PART_ELEMENT_H */
+#endif /* WODEN_PART_ELEMENT_H */

Modified: webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c?rev=419167&r1=419166&r2=419167&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c (original)
+++ webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c Tue Jul  4 22:41:04 2006
@@ -21,7 +21,7 @@
 #include <axis2_utils.h>
 #include <platforms/axis2_platform_auto_sense.h>
 #include <woden_reader.h>
-#include <woden_wsdl10_desc.h>
+#include <woden_desc.h>
 #include <woden_interface.h>
 #include <woden_binding.h>
 #include <woden_element_decl.h>
@@ -71,7 +71,7 @@
     reader = woden_reader_create(env);
     
     desc = (void *)WODEN_READER_READ_WSDL(reader, env, om_doc, doc_base_uri);
-    intfaces = WODEN_WSDL10_DESC_GET_INTERFACES(desc, env);
+    intfaces = WODEN_DESC_GET_INTERFACES(desc, env);
     intface = AXIS2_ARRAY_LIST_GET(intfaces, env, 0);
     if (intface)
     {
@@ -79,7 +79,7 @@
     }
     if (intface_qname) 
         printf("Interface qname is %s\n", AXIS2_QNAME_TO_STRING(intface_qname, env));
-    svc_list = WODEN_WSDL10_DESC_ELEMENT_GET_SVC_ELEMENTS(desc, env);
+    svc_list = WODEN_DESC_ELEMENT_GET_SVC_ELEMENTS(desc, env);
     if (svc_list)
     {
         void *svc = NULL;
@@ -93,7 +93,7 @@
             }
         }
     }
-    binding_list = WODEN_WSDL10_DESC_ELEMENT_GET_BINDING_ELEMENTS(desc, env);
+    binding_list = WODEN_DESC_ELEMENT_GET_BINDING_ELEMENTS(desc, env);
     if (binding_list)
     {
         void *binding = NULL;
@@ -108,7 +108,7 @@
         }
     }
 
-    ed_list = WODEN_WSDL10_DESC_GET_ELEMENT_DECLS(desc, env);
+    ed_list = WODEN_DESC_GET_ELEMENT_DECLS(desc, env);
     if (ed_list)
     {
         
@@ -116,7 +116,7 @@
         if (ed)
             ed_qname = WODEN_ELEMENT_DECL_GET_QNAME(ed, env);
     }
-    ed = WODEN_WSDL10_DESC_GET_ELEMENT_DECL(desc, env, ed_qname);
+    ed = WODEN_DESC_GET_ELEMENT_DECL(desc, env, ed_qname);
     if (ed)
     {
         axis2_char_t *content_model = NULL;



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