axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r414220 - in /webservices/axis2/trunk/c/woden: include/ src/builder/ src/util/ src/wsdl20/ src/wsdl20/enumeration/ src/wsdl20/extensions/soap/
Date Wed, 14 Jun 2006 12:28:48 GMT
Author: damitha
Date: Wed Jun 14 05:28:48 2006
New Revision: 414220

URL: http://svn.apache.org/viewvc?rev=414220&view=rev
Log:
More link error fixes

Modified:
    webservices/axis2/trunk/c/woden/include/woden_property_element.h
    webservices/axis2/trunk/c/woden/src/builder/reader.c
    webservices/axis2/trunk/c/woden/src/util/Makefile.am
    webservices/axis2/trunk/c/woden/src/util/component_model_builder.c
    webservices/axis2/trunk/c/woden/src/util/woden_component_model_builder.h
    webservices/axis2/trunk/c/woden/src/wsdl20/binding.c
    webservices/axis2/trunk/c/woden/src/wsdl20/binding_fault.c
    webservices/axis2/trunk/c/woden/src/wsdl20/binding_fault_ref.c
    webservices/axis2/trunk/c/woden/src/wsdl20/binding_msg_ref.c
    webservices/axis2/trunk/c/woden/src/wsdl20/binding_op.c
    webservices/axis2/trunk/c/woden/src/wsdl20/desc.c
    webservices/axis2/trunk/c/woden/src/wsdl20/enumeration/soap_fault_code.c
    webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block.c
    webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module.c
    webservices/axis2/trunk/c/woden/src/wsdl20/interface_msg_ref.c

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=414220&r1=414219&r2=414220&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_property_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_property_element.h Wed Jun 14 05:28:48 2006
@@ -190,7 +190,16 @@
 
 #define WODEN_PROPERTY_ELEMENT_GET_REF(doc_el, env) \
       (((woden_property_element_t *) doc_el)->ops->\
-         get_ref(doc_el, env))
+         get_value(doc_el, env))
+
+#define WODEN_PROPERTY_ELEMENT_SET_VALUE(doc_el, env, value) \
+      (((woden_property_element_t *) doc_el)->ops->\
+         set_value(doc_el, env, value))
+
+#define WODEN_PROPERTY_ELEMENT_GET_VALUE(doc_el, env) \
+      (((woden_property_element_t *) doc_el)->ops->\
+         get_value(doc_el, env))
+
 
 #define WODEN_PROPERTY_ELEMENT_SET_CONSTRAINT_QNAME(doc_el, env, qname) \
       (((woden_property_element_t *) doc_el)->ops->\

Modified: webservices/axis2/trunk/c/woden/src/builder/reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/reader.c?rev=414220&r1=414219&r2=414220&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/reader.c Wed Jun 14 05:28:48 2006
@@ -20,8 +20,8 @@
 
 #include <woden_binding_fault.h>
 #include <woden_binding_fault_ref.h>
-#include <woden_binding.h>
 #include <woden_binding_msg_ref.h>
+#include <woden_binding.h>
 #include <woden_binding_op.h>
 #include <woden_configurable_component.h>
 #include <woden_configurable.h>
@@ -115,6 +115,7 @@
 #include <axis2_xml_reader.h>
 #include <axiom_util.h>
 #include <axis2_utils.h>
+#include <axis2_generic_obj.h>
 
 #include <axis2_string_util.h>
 
@@ -2839,14 +2840,16 @@
         woden_direction_t *direction_in = NULL;
         
         direction_in = woden_direction_get_direction_in(env);
-        WODEN_BINDING_MSG_REF_SET_DIRECTION(msg_ref, env, direction_in);
+        msg_ref = woden_binding_msg_ref_to_binding_msg_ref_element(msg_ref, env);
+        WODEN_BINDING_MSG_REF_ELEMENT_SET_DIRECTION(msg_ref, env, direction_in);
     }
     if(0 == AXIS2_STRCMP(WODEN_ELEM_OUTPUT, localname))
     {
         woden_direction_t *direction_out = NULL;
         
         direction_out = woden_direction_get_direction_out(env);
-        WODEN_BINDING_MSG_REF_SET_DIRECTION(msg_ref, env, direction_out);
+        msg_ref = woden_binding_msg_ref_to_binding_msg_ref_element(msg_ref, env);
+        WODEN_BINDING_MSG_REF_ELEMENT_SET_DIRECTION(msg_ref, env, direction_out);
     }
     
     msg_label_str = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(msg_ref_el, env, 
@@ -2912,7 +2915,7 @@
         label_out_str = WODEN_MSG_LABEL_TO_STRING(msg_label_out, env);
         direction_in = woden_direction_get_direction_in(env); 
         direction_out = woden_direction_get_direction_out(env); 
-        if(AXIS2_TRUE == WODEN_DIRECTION_EQUALS(direction, direction_in))
+        if(direction == direction_in)
         {
             msg_ref = 
                 woden_binding_msg_ref_to_binding_msg_ref_element(
@@ -3533,10 +3536,11 @@
             
             /* The property value consists of the child info items of <value> */
             node_list = AXIOM_ELEMENT_GET_CHILD_ELEMENTS(temp_el, env, temp_el_node);
+            node_list_obj = axis2_generic_obj_create(env);
             AXIS2_GENERIC_OBJ_SET_VALUE(node_list_obj, env, node_list);
             AXIS2_GENERIC_OBJ_SET_FREE_FUNC(node_list_obj, env, node_list->ops->free_fn);
             property = woden_property_to_property_element(property, env);
-            AXIS2_PROPERTY_ELEMENT_SET_VALUE(property, env);
+            WODEN_PROPERTY_ELEMENT_SET_VALUE(property, env, node_list_obj);
         }
         else if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_constraint, temp_el_node))

Modified: webservices/axis2/trunk/c/woden/src/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/Makefile.am?rev=414220&r1=414219&r2=414220&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/util/Makefile.am Wed Jun 14 05:28:48 2006
@@ -1,8 +1,7 @@
 TESTS =
-lib_LTLIBRARIES = libwoden_util.la
+noinst_LTLIBRARIES = libwoden_util.la
 
 libwoden_util_la_SOURCES = \
-								 generic_obj.c \
 								 qname_util.c \
 								 woden_om_util.c \
 								 component_model_builder.c

Modified: webservices/axis2/trunk/c/woden/src/util/component_model_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/component_model_builder.c?rev=414220&r1=414219&r2=414220&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/component_model_builder.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/component_model_builder.c Wed Jun 14 05:28:48
2006
@@ -75,6 +75,12 @@
         void *builder, 
         const axis2_env_t *env); 
 
+static axis2_status_t
+init_components(
+        void *builder,
+        const axis2_env_t *env,
+        void *desc);
+
 /*
  * Extract from the collections of in-scope schemas
  * the element declarations and type definitions.
@@ -245,7 +251,7 @@
 
 /************************** End of function prototypes ************************/
 
-woden_component_model_builder_t *AXIS2_CALL 
+AXIS2_EXTERN woden_component_model_builder_t *AXIS2_CALL 
 woden_component_model_builder_create(
         const axis2_env_t *env,
         void *desc)
@@ -284,8 +290,7 @@
         woden_component_model_builder_free;
     
     builder_impl->f_desc = desc;
-    woden_component_model_builder_init_components(&(builder_impl->builder), env, 
-            builder_impl->f_desc);
+    init_components(&(builder_impl->builder), env, builder_impl->f_desc);
    return &(builder_impl->builder);
 }
 
@@ -1026,7 +1031,7 @@
                 binding, env, ext_ns);
         binding = woden_binding_to_element_extensible(
                 binding, env);
-        temp2 = WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
+        temp2 = WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ELEMENTS_FOR_NAMESPACE(
                 binding, env, ext_ns);
         if(AXIS2_TRUE == temp1 || AXIS2_TRUE == temp2)
         {
@@ -1121,7 +1126,7 @@
                 bind_fault, env, ext_ns);
         bind_fault = woden_binding_fault_to_element_extensible(
                 bind_fault, env);
-        temp2 = WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
+        temp2 = WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ELEMENTS_FOR_NAMESPACE(
                 bind_fault, env, ext_ns);
         if(AXIS2_TRUE == temp1 || AXIS2_TRUE == temp2)
         {
@@ -1211,7 +1216,7 @@
                 bind_op, env, ext_ns);
         bind_op = woden_binding_op_to_element_extensible(
                 bind_op, env);
-        temp2 = WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
+        temp2 = WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ELEMENTS_FOR_NAMESPACE(
                 bind_op, env, ext_ns);
         if(AXIS2_TRUE == temp1 || AXIS2_TRUE == temp2)
         {
@@ -1298,7 +1303,7 @@
                 bind_msg_ref, env, ext_ns);
         bind_msg_ref = woden_binding_msg_ref_to_element_extensible(
                 bind_msg_ref, env);
-        temp2 = WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
+        temp2 = WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ELEMENTS_FOR_NAMESPACE(
                 bind_msg_ref, env, ext_ns);
         if(AXIS2_TRUE == temp1 || AXIS2_TRUE == temp2)
         {
@@ -1347,7 +1352,7 @@
                 bind_fault_ref, env, ext_ns);
         bind_fault_ref = woden_binding_fault_ref_to_element_extensible(
                 bind_fault_ref, env);
-        temp2 = WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
+        temp2 = WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ELEMENTS_FOR_NAMESPACE(
                 bind_fault_ref, env, ext_ns);
         if(AXIS2_TRUE == temp1 || AXIS2_TRUE == temp2)
         {

Modified: webservices/axis2/trunk/c/woden/src/util/woden_component_model_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/woden_component_model_builder.h?rev=414220&r1=414219&r2=414220&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/woden_component_model_builder.h (original)
+++ webservices/axis2/trunk/c/woden/src/util/woden_component_model_builder.h Wed Jun 14 05:28:48
2006
@@ -30,12 +30,8 @@
   * @{
   */
 
-typedef union woden_component_model_builder_base woden_component_model_builder_base_t;
 typedef struct woden_component_model_builder woden_component_model_builder_t;
 typedef struct woden_component_model_builder_ops woden_component_model_builder_ops_t;
-struct woden_documentation_element;
-struct woden_wsdl_component;
-struct woden_documentable;
 
 #ifdef __cplusplus
 extern "C"
@@ -59,7 +55,7 @@
     woden_component_model_builder_ops_t *ops;
 };
 
-AXIS2_EXTERN woden_component_model_builder_t * AXIS2_CALL
+AXIS2_EXTERN woden_component_model_builder_t *AXIS2_CALL 
 woden_component_model_builder_create(
         const axis2_env_t *env,
         void *desc);

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/binding.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/binding.c?rev=414220&r1=414219&r2=414220&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/binding.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/binding.c Wed Jun 14 05:28:48 2006
@@ -23,6 +23,7 @@
 #include <woden_binding_fault_element.h>
 #include <woden_interface.h>
 #include <woden_binding_op_element.h>
+#include <woden_element_extensible.h>
 
 typedef struct woden_binding_impl woden_binding_impl_t;
 
@@ -393,9 +394,9 @@
         base.documentable_element.wsdl_element.base.attr_extensible.ops = 
         AXIS2_MALLOC(env->allocator, 
                 sizeof(woden_attr_extensible_ops_t));
-    woden_element_ext_resolve_methods(&(binding_impl->binding.base.
+    woden_attr_extensible_resolve_methods(&(binding_impl->binding.base.
             binding_element.base.documentable_element.
-            wsdl_element.base.attr_extensible), env, binding_impl->methods);
+            wsdl_element.base.attr_extensible), env, NULL, binding_impl->methods);
     return binding;
 }
 
@@ -419,9 +420,9 @@
         base.documentable_element.wsdl_element.base.element_extensible.ops = 
         AXIS2_MALLOC(env->allocator, 
                 sizeof(woden_element_extensible_ops_t));
-    woden_element_ext_resolve_methods(&(binding_impl->binding.base.
+    woden_element_extensible_resolve_methods(&(binding_impl->binding.base.
             binding_element.base.documentable_element.
-            wsdl_element.base.element_extensible), env, binding_impl->methods);
+            wsdl_element.base.element_extensible), env, NULL, binding_impl->methods);
     return binding;
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/binding_fault.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/binding_fault.c?rev=414220&r1=414219&r2=414220&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/binding_fault.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/binding_fault.c Wed Jun 14 05:28:48 2006
@@ -264,7 +264,7 @@
     else
         binding_fault_impl = (woden_binding_fault_impl_t *) binding_fault;
 
-    woden_binding_free_ops(binding_fault, env);
+    woden_binding_fault_free_ops(binding_fault, env);
 
     binding_fault_impl->binding_fault.base.binding_fault_element.base.documentable_element.ops
= 
         AXIS2_MALLOC(env->allocator, 
@@ -290,7 +290,7 @@
     else
         binding_fault_impl = (woden_binding_fault_impl_t *) binding_fault;
 
-    woden_binding_free_ops(binding_fault, env);
+    woden_binding_fault_free_ops(binding_fault, env);
 
     binding_fault_impl->binding_fault.base.nested_configurable.base.
         configurable.base.documentable.ops = AXIS2_MALLOC(env->allocator, 
@@ -342,7 +342,7 @@
     else
         binding_fault_impl = (woden_binding_fault_impl_t *) binding_fault;
 
-    woden_binding_free_ops(binding_fault, env);
+    woden_binding_fault_free_ops(binding_fault, env);
 
     binding_fault_impl->binding_fault.base.binding_fault_element.base.configurable_element.ops
= 
         AXIS2_MALLOC(env->allocator, 
@@ -373,9 +373,9 @@
         base.documentable_element.wsdl_element.base.attr_extensible.ops = 
         AXIS2_MALLOC(env->allocator, 
                 sizeof(woden_attr_extensible_ops_t));
-    woden_element_ext_resolve_methods(&(binding_fault_impl->binding_fault.base.
+    woden_attr_extensible_resolve_methods(&(binding_fault_impl->binding_fault.base.
             binding_fault_element.base.documentable_element.
-            wsdl_element.base.attr_extensible), env, binding_fault_impl->methods);
+            wsdl_element.base.attr_extensible), env, NULL, binding_fault_impl->methods);
     return binding_fault;
 }
 
@@ -399,9 +399,9 @@
         base.documentable_element.wsdl_element.base.element_extensible.ops = 
         AXIS2_MALLOC(env->allocator, 
                 sizeof(woden_element_extensible_ops_t));
-    woden_element_ext_resolve_methods(&(binding_fault_impl->binding_fault.base.
+    woden_element_extensible_resolve_methods(&(binding_fault_impl->binding_fault.base.
             binding_fault_element.base.documentable_element.
-            wsdl_element.base.element_extensible), env, binding_fault_impl->methods);
+            wsdl_element.base.element_extensible), env, NULL, binding_fault_impl->methods);
     return binding_fault;
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/binding_fault_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/binding_fault_ref.c?rev=414220&r1=414219&r2=414220&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/binding_fault_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/binding_fault_ref.c Wed Jun 14 05:28:48 2006
@@ -315,7 +315,7 @@
     else
         binding_fault_ref_impl = (woden_binding_fault_ref_impl_t *) binding_fault_ref;
 
-    woden_binding_free_ops(binding_fault_ref, env);
+    woden_binding_fault_ref_free_ops(binding_fault_ref, env);
 
     binding_fault_ref_impl->binding_fault_ref.base.binding_fault_ref_element.base.configurable_element.ops
= 
         AXIS2_MALLOC(env->allocator, 
@@ -340,7 +340,7 @@
     else
         binding_fault_ref_impl = (woden_binding_fault_ref_impl_t *) binding_fault_ref;
 
-    woden_binding_free_ops(binding_fault_ref, env);
+    woden_binding_fault_ref_free_ops(binding_fault_ref, env);
 
     binding_fault_ref_impl->binding_fault_ref.base.binding_fault_ref_element.base.documentable_element.ops
= 
         AXIS2_MALLOC(env->allocator, 
@@ -366,7 +366,7 @@
     else
         binding_fault_ref_impl = (woden_binding_fault_ref_impl_t *) binding_fault_ref;
 
-    woden_binding_free_ops(binding_fault_ref, env);
+    woden_binding_fault_ref_free_ops(binding_fault_ref, env);
 
     binding_fault_ref_impl->binding_fault_ref.base.nested_configurable.base.
         configurable.base.documentable.ops = AXIS2_MALLOC(env->allocator, 
@@ -399,9 +399,9 @@
         base.documentable_element.wsdl_element.base.attr_extensible.ops = 
         AXIS2_MALLOC(env->allocator, 
                 sizeof(woden_attr_extensible_ops_t));
-    woden_element_ext_resolve_methods(&(binding_fault_ref_impl->binding_fault_ref.base.
+    woden_attr_extensible_resolve_methods(&(binding_fault_ref_impl->binding_fault_ref.base.
             binding_fault_ref_element.base.documentable_element.
-            wsdl_element.base.attr_extensible), env, binding_fault_ref_impl->methods);
+            wsdl_element.base.attr_extensible), env, NULL, binding_fault_ref_impl->methods);
     return binding_fault_ref;
 }
 
@@ -425,9 +425,9 @@
         base.documentable_element.wsdl_element.base.element_extensible.ops = 
         AXIS2_MALLOC(env->allocator, 
                 sizeof(woden_element_extensible_ops_t));
-    woden_element_ext_resolve_methods(&(binding_fault_ref_impl->binding_fault_ref.base.
+    woden_element_extensible_resolve_methods(&(binding_fault_ref_impl->binding_fault_ref.base.
             binding_fault_ref_element.base.documentable_element.
-            wsdl_element.base.element_extensible), env, binding_fault_ref_impl->methods);
+            wsdl_element.base.element_extensible), env, NULL, binding_fault_ref_impl->methods);
     return binding_fault_ref;
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/binding_msg_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/binding_msg_ref.c?rev=414220&r1=414219&r2=414220&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/binding_msg_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/binding_msg_ref.c Wed Jun 14 05:28:48 2006
@@ -301,7 +301,7 @@
     else
         binding_msg_ref_impl = (woden_binding_msg_ref_impl_t *) binding_msg_ref;
 
-    woden_binding_free_ops(binding_msg_ref, env);
+    woden_binding_msg_ref_free_ops(binding_msg_ref, env);
 
     binding_msg_ref_impl->binding_msg_ref.base.binding_msg_ref_element.base.configurable_element.ops
= 
         AXIS2_MALLOC(env->allocator, 
@@ -327,7 +327,7 @@
     else
         binding_msg_ref_impl = (woden_binding_msg_ref_impl_t *) binding_msg_ref;
 
-    woden_binding_free_ops(binding_msg_ref, env);
+    woden_binding_msg_ref_free_ops(binding_msg_ref, env);
 
     binding_msg_ref_impl->binding_msg_ref.base.binding_msg_ref_element.base.documentable_element.ops
= 
         AXIS2_MALLOC(env->allocator, 
@@ -353,7 +353,7 @@
     else
         binding_msg_ref_impl = (woden_binding_msg_ref_impl_t *) binding_msg_ref;
 
-    woden_binding_free_ops(binding_msg_ref, env);
+    woden_binding_msg_ref_free_ops(binding_msg_ref, env);
 
     binding_msg_ref_impl->binding_msg_ref.base.nested_configurable.base.
         configurable.base.documentable.ops = AXIS2_MALLOC(env->allocator, 
@@ -384,9 +384,9 @@
         base.documentable_element.wsdl_element.base.attr_extensible.ops = 
         AXIS2_MALLOC(env->allocator, 
                 sizeof(woden_attr_extensible_ops_t));
-    woden_element_ext_resolve_methods(&(binding_msg_ref_impl->binding_msg_ref.base.
+    woden_attr_extensible_resolve_methods(&(binding_msg_ref_impl->binding_msg_ref.base.
             binding_msg_ref_element.base.documentable_element.
-            wsdl_element.base.attr_extensible), env, binding_msg_ref_impl->methods);
+            wsdl_element.base.attr_extensible), env, NULL, binding_msg_ref_impl->methods);
     return binding_msg_ref;
 }
 
@@ -412,9 +412,9 @@
         base.documentable_element.wsdl_element.base.element_extensible.ops = 
         AXIS2_MALLOC(env->allocator, 
                 sizeof(woden_element_extensible_ops_t));
-    woden_element_ext_resolve_methods(&(binding_msg_ref_impl->binding_msg_ref.base.
+    woden_element_extensible_resolve_methods(&(binding_msg_ref_impl->binding_msg_ref.base.
             binding_msg_ref_element.base.documentable_element.
-            wsdl_element.base.element_extensible), env, binding_msg_ref_impl->methods);
+            wsdl_element.base.element_extensible), env, NULL, binding_msg_ref_impl->methods);
     return binding_msg_ref;
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/binding_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/binding_op.c?rev=414220&r1=414219&r2=414220&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/binding_op.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/binding_op.c Wed Jun 14 05:28:48 2006
@@ -336,7 +336,7 @@
     else
         binding_op_impl = (woden_binding_op_impl_t *) binding_op;
 
-    woden_binding_free_ops(binding_op, env);
+    woden_binding_op_free_ops(binding_op, env);
 
     binding_op_impl->binding_op.base.binding_op_element.base.configurable_element.ops
= 
         AXIS2_MALLOC(env->allocator, 
@@ -362,7 +362,7 @@
     else
         binding_op_impl = (woden_binding_op_impl_t *) binding_op;
 
-    woden_binding_free_ops(binding_op, env);
+    woden_binding_op_free_ops(binding_op, env);
 
     binding_op_impl->binding_op.base.binding_op_element.base.documentable_element.ops
= 
         AXIS2_MALLOC(env->allocator, 
@@ -388,7 +388,7 @@
     else
         binding_op_impl = (woden_binding_op_impl_t *) binding_op;
 
-    woden_binding_free_ops(binding_op, env);
+    woden_binding_op_free_ops(binding_op, env);
 
     binding_op_impl->binding_op.base.nested_configurable.base.
         configurable.base.documentable.ops = AXIS2_MALLOC(env->allocator, 
@@ -421,9 +421,9 @@
         base.documentable_element.wsdl_element.base.attr_extensible.ops = 
         AXIS2_MALLOC(env->allocator, 
                 sizeof(woden_attr_extensible_ops_t));
-    woden_element_ext_resolve_methods(&(binding_op_impl->binding_op.base.
+    woden_attr_extensible_resolve_methods(&(binding_op_impl->binding_op.base.
             binding_op_element.base.documentable_element.
-            wsdl_element.base.attr_extensible), env, binding_op_impl->methods);
+            wsdl_element.base.attr_extensible), env, NULL, binding_op_impl->methods);
     return binding_op;
 }
 
@@ -447,9 +447,9 @@
         base.documentable_element.wsdl_element.base.element_extensible.ops = 
         AXIS2_MALLOC(env->allocator, 
                 sizeof(woden_element_extensible_ops_t));
-    woden_element_ext_resolve_methods(&(binding_op_impl->binding_op.base.
+    woden_element_extensible_resolve_methods(&(binding_op_impl->binding_op.base.
             binding_op_element.base.documentable_element.
-            wsdl_element.base.element_extensible), env, binding_op_impl->methods);
+            wsdl_element.base.element_extensible), env, NULL, binding_op_impl->methods);
     return binding_op;
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/desc.c?rev=414220&r1=414219&r2=414220&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/desc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/desc.c Wed Jun 14 05:28:48 2006
@@ -41,6 +41,7 @@
 #include <woden_component_exts.h>
 #include <woden_xml_attr.h>
 #include <woden_documentation_element.h>
+#include "../util/woden_component_model_builder.h"
 
 typedef struct woden_desc_impl woden_desc_impl_t;
 
@@ -1960,7 +1961,9 @@
                 "WODEN_DESC", AXIS2_HASH_KEY_STRING));
 
     desc_impl->f_component_initialized = AXIS2_TRUE;
-    return woden_component_model_builder_create(env, &(desc_impl->desc));
+    woden_component_model_builder_create(env, &(desc_impl->desc));
+    
+    return AXIS2_SUCCESS;
 }
 
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/enumeration/soap_fault_code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/enumeration/soap_fault_code.c?rev=414220&r1=414219&r2=414220&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/enumeration/soap_fault_code.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/enumeration/soap_fault_code.c Wed Jun 14 05:28:48
2006
@@ -158,7 +158,7 @@
 }
 
 axis2_bool_t AXIS2_CALL
-woden_soap_fault_code_get_soap_fault_code_is_qname(
+woden_soap_fault_code_is_qname(
         void *soap_fault_code,
         const axis2_env_t *env)
 {

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block.c?rev=414220&r1=414219&r2=414220&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block.c Wed Jun
14 05:28:48 2006
@@ -1110,7 +1110,7 @@
     header_block_impl = INTF_TO_IMPL(axis2_hash_get(super, 
                 "WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
-    return WODEN_ATTR_EXTENSIBLE_SET_EXT_ATTRIBUTE(
+    return WODEN_ATTR_EXTENSIBLE_SET_EXT_ATTR(
             header_block_impl->f_attr_ext, env, attr_type, attr);
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module.c?rev=414220&r1=414219&r2=414220&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module.c Wed Jun 14 05:28:48
2006
@@ -927,7 +927,7 @@
     module_impl = INTF_TO_IMPL(axis2_hash_get(super, 
                 "WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
-    return WODEN_ATTR_EXTENSIBLE_SET_EXT_ATTRIBUTE(
+    return WODEN_ATTR_EXTENSIBLE_SET_EXT_ATTR(
             module_impl->f_attr_ext, env, attr_type, attr);
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/interface_msg_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/interface_msg_ref.c?rev=414220&r1=414219&r2=414220&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/interface_msg_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/interface_msg_ref.c Wed Jun 14 05:28:48 2006
@@ -706,7 +706,7 @@
         interface_msg_ref_impl->nested_configurable = NULL;
     }
 
-    axis2_interface_msg_ref_free_ops(interface_msg_ref, env);
+    woden_interface_msg_ref_free_ops(interface_msg_ref, env);
 
     if((&(interface_msg_ref_impl->interface_msg_ref))->ops)
     {



---------------------------------------------------------------------
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