axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r415494 - in /webservices/axis2/trunk/c/woden: ./ include/ samples/ src/ src/builder/ src/util/ src/wsdl20/ src/wsdl20/extensions/soap/ src/wsdl20/xml/
Date Tue, 20 Jun 2006 04:27:07 GMT
Author: damitha
Date: Mon Jun 19 21:27:06 2006
New Revision: 415494

URL: http://svn.apache.org/viewvc?rev=415494&view=rev
Log:
Working on wsdl1 support

Added:
    webservices/axis2/trunk/c/woden/src/wsdl20/component_model_builder.c
      - copied, changed from r414762, webservices/axis2/trunk/c/woden/src/util/component_model_builder.c
    webservices/axis2/trunk/c/woden/src/wsdl20/woden_component_model_builder.h
      - copied unchanged from r414762, webservices/axis2/trunk/c/woden/src/util/woden_component_model_builder.h
    webservices/axis2/trunk/c/woden/src/wsdl20/woden_om_util.c
      - copied, changed from r414762, webservices/axis2/trunk/c/woden/src/util/woden_om_util.c
    webservices/axis2/trunk/c/woden/src/wsdl20/woden_om_util.h
      - copied, changed from r414762, webservices/axis2/trunk/c/woden/src/util/woden_om_util.h
Removed:
    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/util/woden_om_util.c
    webservices/axis2/trunk/c/woden/src/util/woden_om_util.h
Modified:
    webservices/axis2/trunk/c/woden/configure.ac
    webservices/axis2/trunk/c/woden/include/woden.h
    webservices/axis2/trunk/c/woden/samples/Makefile.am
    webservices/axis2/trunk/c/woden/src/Makefile.am
    webservices/axis2/trunk/c/woden/src/builder/Makefile.am
    webservices/axis2/trunk/c/woden/src/builder/reader.c
    webservices/axis2/trunk/c/woden/src/util/Makefile.am
    webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am
    webservices/axis2/trunk/c/woden/src/wsdl20/desc.c
    webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block_deserializer.c
    webservices/axis2/trunk/c/woden/src/wsdl20/xml/Makefile.am

Modified: webservices/axis2/trunk/c/woden/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/configure.ac?rev=415494&r1=415493&r2=415494&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/configure.ac (original)
+++ webservices/axis2/trunk/c/woden/configure.ac Mon Jun 19 21:27:06 2006
@@ -127,8 +127,15 @@
     src/wsdl20/enumeration/Makefile \
     src/wsdl20/extensions/Makefile \
     src/wsdl20/extensions/soap/Makefile \
+    src/wsdl10/Makefile \
+    src/wsdl10/xml/Makefile \
+    src/wsdl10/enumeration/Makefile \
+    src/wsdl10/extensions/Makefile \
+    src/wsdl10/extensions/soap/Makefile \
     src/builder/Makefile \
+    src/builder/wsdl10/Makefile \
     samples/Makefile \
+    samples/wsdl10/Makefile \
     test/Makefile
     ])
     

Modified: webservices/axis2/trunk/c/woden/include/woden.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden.h?rev=415494&r1=415493&r2=415494&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden.h Mon Jun 19 21:27:06 2006
@@ -90,7 +90,39 @@
         WODEN_SOAP_HEADER_BLOCK,
         WODEN_SOAP_MODULE,
         WODEN_SOAP_MODULE_DESERIALIZER,
-        WODEN_SOAP_HEADER_BLOCK_DESERIALIZER
+        WODEN_SOAP_HEADER_BLOCK_DESERIALIZER,
+        /* Wsdl 10 */
+        WODEN_WSDL10_ELEMENT,
+        WODEN_WSDL10_ATTR_EXTENSIBLE,
+        WODEN_WSDL10_ELEMENT_EXTENSIBLE,
+        WODEN_WSDL10_FEATURE,
+        WODEN_WSDL10_PROPERTY,
+        WODEN_WSDL10_DESC,
+        WODEN_WSDL10_TYPES,
+        WODEN_WSDL10_DOCUMENTATION,
+        WODEN_WSDL10_TYPE_DEF,
+        WODEN_WSDL10_INTERFACE,
+        WODEN_WSDL10_INTERFACE_FAULT,
+        WODEN_WSDL10_INTERFACE_FAULT_REF,
+        WODEN_WSDL10_INTERFACE_MSG_REF,
+        WODEN_WSDL10_MSG_REF,
+        WODEN_WSDL10_PART,
+        WODEN_WSDL10_INTERFACE_OP,
+        WODEN_WSDL10_BINDING,
+        WODEN_WSDL10_BINDING_FAULT,
+        WODEN_WSDL10_BINDING_FAULT_REF,
+        WODEN_WSDL10_BINDING_MSG_REF,
+        WODEN_WSDL10_BINDING_OP,
+        WODEN_WSDL10_ENDPOINT,
+        WODEN_WSDL10_SVC,
+        WODEN_WSDL10_ELEMENT_DECL,
+        WODEN_WSDL10_SOAP_BINDING_EXTS,
+        WODEN_WSDL10_SOAP_BINDING_FAULT_EXTS,
+        WODEN_WSDL10_SOAP_BINDING_FAULT_REF_EXTS,
+        WODEN_WSDL10_SOAP_BINDING_MSG_REF_EXTS,
+        WODEN_WSDL10_SOAP_BINDING_OP_EXTS,
+        WODEN_WSDL10_IMPORT,
+        WODEN_WSDL10_INCLUDE,
     } woden_obj_types_t;
 
 /** @} */

Modified: webservices/axis2/trunk/c/woden/samples/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/Makefile.am?rev=415494&r1=415493&r2=415494&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/samples/Makefile.am Mon Jun 19 21:27:06 2006
@@ -1,7 +1,10 @@
+SUBDIRS = wsdl10
 prgbindir=$(prefix)/bin/samples/woden
 prgbin_PROGRAMS = test_wsdl2
 check_PROGRAMS = test_wsdl2
-test_wsdl2_SOURCES = test_wsdl2.c
+test_wsdl2_SOURCES = \
+					 test_wsdl2.c
+					 
 test_wsdl2_LDADD   =  \
                    	-laxis2_util \
 					-laxis2_axiom \

Modified: webservices/axis2/trunk/c/woden/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/Makefile.am?rev=415494&r1=415493&r2=415494&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/Makefile.am Mon Jun 19 21:27:06 2006
@@ -1 +1 @@
-SUBDIRS = util types schema xml builder wsdl20
+SUBDIRS = util types schema xml builder wsdl20 wsdl10

Modified: webservices/axis2/trunk/c/woden/src/builder/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/Makefile.am?rev=415494&r1=415493&r2=415494&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/builder/Makefile.am Mon Jun 19 21:27:06 2006
@@ -1,3 +1,4 @@
+SUBDIRS = wsdl10
 noinst_LTLIBRARIES = libwoden_builder.la
 
 libwoden_builder_la_SOURCES = \

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=415494&r1=415493&r2=415494&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/reader.c Mon Jun 19 21:27:06 2006
@@ -99,7 +99,7 @@
 #include <woden_ext_deserializer.h>
 
 #include "../wsdl20/woden_constants.h"
-#include "../util/woden_om_util.h"
+#include "../wsdl20/woden_om_util.h"
 
 #include <xml_schema.h>
 #include <xml_schema_collection.h>
@@ -1508,8 +1508,12 @@
     if(NULL != element)
     {
         axis2_qname_t *qname = NULL;
+        axis2_hash_t *namespcs = NULL;
 
-        qname = woden_om_util_get_qname(env, fault_el_node, element, desc);
+        desc = woden_desc_to_desc_element(desc, env);
+        namespcs = WODEN_DESC_ELEMENT_GET_NAMESPACES(desc, env);
+
+        qname = woden_om_util_get_qname(env, fault_el_node, element, namespcs);
         fault = woden_interface_fault_to_interface_fault_element(fault, env);
         WODEN_INTERFACE_FAULT_ELEMENT_SET_QNAME(fault, env, qname);
     }
@@ -1825,8 +1829,12 @@
     if(NULL != ref)
     {
         axis2_qname_t *qname = NULL;
+        axis2_hash_t *namespcs = NULL;
+
+        desc = woden_desc_to_desc_element(desc, env);
+        namespcs = WODEN_DESC_ELEMENT_GET_NAMESPACES(desc, env);
 
-        qname = woden_om_util_get_qname(env, fault_ref_el_node, ref, desc);
+        qname = woden_om_util_get_qname(env, fault_ref_el_node, ref, namespcs);
         fault_ref = 
             woden_interface_fault_ref_to_interface_fault_ref_element(
                     fault_ref, env);
@@ -1975,7 +1983,7 @@
     
     msg_ref_el = AXIOM_NODE_GET_DATA_ELEMENT(msg_ref_el_node, env);
     localname = AXIOM_ELEMENT_GET_LOCALNAME(msg_ref_el, env);
-    if(0 == AXIS2_STRCMP(WODEN_ELEM_INFAULT, localname))
+    if(0 == AXIS2_STRCMP(WODEN_ELEM_INPUT, localname))
     {
         woden_direction_t *direction_in = NULL;
         
@@ -1984,7 +1992,7 @@
                 msg_ref, env);
         WODEN_INTERFACE_MSG_REF_ELEMENT_SET_DIRECTION(msg_ref, env, direction_in);
     }
-    if(0 == AXIS2_STRCMP(WODEN_ELEM_OUTFAULT, localname))
+    if(0 == AXIS2_STRCMP(WODEN_ELEM_OUTPUT, localname))
     {
         woden_direction_t *direction_out = NULL;
         
@@ -2087,6 +2095,7 @@
         else
         {
             axis2_qname_t *qname = NULL;
+            axis2_hash_t *namespcs = NULL;
 
             /* element is not #any, #none or #other, so it must be an element 
              * qname 
@@ -2097,7 +2106,9 @@
             WODEN_INTERFACE_MSG_REF_ELEMENT_SET_MSG_CONTENT_MODEL(msg_ref, 
                     env, element);
 
-            qname = woden_om_util_get_qname(env, msg_ref_el_node, element, desc);
+            desc = woden_desc_to_desc_element(desc, env);
+            namespcs = WODEN_DESC_ELEMENT_GET_NAMESPACES(desc, env);
+            qname = woden_om_util_get_qname(env, msg_ref_el_node, element, namespcs);
             WODEN_INTERFACE_MSG_REF_ELEMENT_SET_ELEMENT_QNAME(msg_ref, 
                     env, qname);
         }
@@ -2220,7 +2231,11 @@
     intface = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(binding_el, env, WODEN_ATTR_INTERFACE);
     if(NULL != intface)
     {
-        intface_qn = woden_om_util_get_qname(env, binding_el_node, intface, desc);
+        axis2_hash_t *namespcs = NULL;
+
+        desc = woden_desc_to_desc_element(desc, env);
+        namespcs = WODEN_DESC_ELEMENT_GET_NAMESPACES(desc, env);
+        intface_qn = woden_om_util_get_qname(env, binding_el_node, intface, namespcs);
         binding = woden_binding_to_binding_element(binding, env);
         WODEN_BINDING_ELEMENT_SET_INTERFACE_QNAME(binding, env, intface_qn);
     }
@@ -2384,7 +2399,11 @@
     
     if(NULL != ref)
     {
-        int_flt_qn = woden_om_util_get_qname(env, fault_el_node, ref, desc);
+        axis2_hash_t *namespcs = NULL;
+        
+        desc = woden_desc_to_desc_element(desc, env);
+        namespcs = WODEN_DESC_ELEMENT_GET_NAMESPACES(desc, env);
+        int_flt_qn = woden_om_util_get_qname(env, fault_el_node, ref, namespcs);
         fault = woden_binding_fault_to_binding_fault_element(fault, env);
         WODEN_BINDING_FAULT_ELEMENT_SET_REF(fault, env, int_flt_qn);
     }
@@ -2525,7 +2544,11 @@
     
     if(NULL != ref)
     {
-        ref_qn = woden_om_util_get_qname(env, op_el_node, ref, desc);
+        axis2_hash_t *namespcs = NULL;
+        
+        desc = woden_desc_to_desc_element(desc, env);
+        namespcs = WODEN_DESC_ELEMENT_GET_NAMESPACES(desc, env);
+        ref_qn = woden_om_util_get_qname(env, op_el_node, ref, namespcs);
         op = woden_binding_op_to_binding_op_element(op, env);
         WODEN_BINDING_OP_ELEMENT_SET_REF(op, env, ref_qn);
     }
@@ -2715,7 +2738,11 @@
     
     if(NULL != ref)
     {
-        ref_qn = woden_om_util_get_qname(env, fault_ref_el_node, ref, desc);
+        axis2_hash_t *namespcs = NULL;
+        
+        desc = woden_desc_to_desc_element(desc, env);
+        namespcs = WODEN_DESC_ELEMENT_GET_NAMESPACES(desc, env);
+        ref_qn = woden_om_util_get_qname(env, fault_ref_el_node, ref, namespcs);
         fault_ref = woden_binding_fault_ref_to_binding_fault_ref_element(
                 fault_ref, env);
         WODEN_BINDING_FAULT_REF_ELEMENT_SET_REF(fault_ref, env, ref_qn);
@@ -3179,7 +3206,11 @@
     intface = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(svc_el, env, WODEN_ATTR_INTERFACE);
     if(NULL != intface)
     {
-        intface_qn = woden_om_util_get_qname(env, svc_el_node, intface, desc);
+        axis2_hash_t *namespcs = NULL;
+        
+        desc = woden_desc_to_desc_element(desc, env);
+        namespcs = WODEN_DESC_ELEMENT_GET_NAMESPACES(desc, env);
+        intface_qn = woden_om_util_get_qname(env, svc_el_node, intface, namespcs);
         svc = woden_svc_to_svc_element(svc, env);
         WODEN_SVC_ELEMENT_SET_INTERFACE_QNAME(svc, env, intface_qn);
     }
@@ -3335,7 +3366,11 @@
     binding = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(endpoint_el, env, WODEN_ATTR_BINDING);
     if(NULL != binding)
     {
-        binding_qn = woden_om_util_get_qname(env, endpoint_el_node, binding, desc);
+        axis2_hash_t *namespcs = NULL;
+        
+        desc = woden_desc_to_desc_element(desc, env);
+        namespcs = WODEN_DESC_ELEMENT_GET_NAMESPACES(desc, env);
+        binding_qn = woden_om_util_get_qname(env, endpoint_el_node, binding, namespcs);
         endpoint = woden_endpoint_to_endpoint_element(endpoint, env);
         WODEN_ENDPOINT_ELEMENT_SET_BINDING_QNAME(endpoint, env, binding_qn);
     }
@@ -3677,9 +3712,13 @@
                     else
                     {
                         axis2_qname_t *qname = NULL;
+                        axis2_hash_t *namespcs = NULL;
+        
+                        desc = woden_desc_to_desc_element(desc, env);
+                        namespcs = WODEN_DESC_ELEMENT_GET_NAMESPACES(desc, env);
 
                         qname = woden_om_util_get_qname(env, temp_el_node, 
-                                text_value, desc);
+                                text_value, namespcs);
                         property = woden_property_to_property_element(property, env);
                         WODEN_PROPERTY_ELEMENT_SET_CONSTRAINT_QNAME(property, env, qname);
                     }

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=415494&r1=415493&r2=415494&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/util/Makefile.am Mon Jun 19 21:27:06 2006
@@ -2,9 +2,7 @@
 noinst_LTLIBRARIES = libwoden_util.la
 
 libwoden_util_la_SOURCES = \
-								 qname_util.c \
-								 woden_om_util.c \
-								 component_model_builder.c
+								 qname_util.c
 
 INCLUDES = -I$(top_builddir)/include \
 			@AXIOMINC@ \

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am?rev=415494&r1=415493&r2=415494&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am Mon Jun 19 21:27:06 2006
@@ -31,7 +31,9 @@
 							element_decl.c \
 							import.c \
 							include.c \
-							desc.c
+							desc.c \
+							component_model_builder.c \
+							woden_om_util.c
 
 libwoden_wsdl20_la_LIBADD =  \
                     $(top_builddir)/src/xml/libwoden_xml.la \

Copied: webservices/axis2/trunk/c/woden/src/wsdl20/component_model_builder.c (from r414762,
webservices/axis2/trunk/c/woden/src/util/component_model_builder.c)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/component_model_builder.c?p2=webservices/axis2/trunk/c/woden/src/wsdl20/component_model_builder.c&p1=webservices/axis2/trunk/c/woden/src/util/component_model_builder.c&r1=414762&r2=415494&rev=415494&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/component_model_builder.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/component_model_builder.c Mon Jun 19 21:27:06
2006
@@ -434,7 +434,7 @@
                 }
             }
             /* if builder_impl->f_schemas_done does not contain schema_def */
-            if(new_schema)
+            if(AXIS2_TRUE == new_schema)
             {
                 build_element_decls(builder, env, schema_def, type_system_uri);
                 build_type_defs(builder, env, schema_def, type_system_uri);

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=415494&r1=415493&r2=415494&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/desc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/desc.c Mon Jun 19 21:27:06 2006
@@ -41,7 +41,7 @@
 #include <woden_component_exts.h>
 #include <woden_xml_attr.h>
 #include <woden_documentation_element.h>
-#include "../util/woden_component_model_builder.h"
+#include "woden_component_model_builder.h"
 
 typedef struct woden_desc_impl woden_desc_impl_t;
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block_deserializer.c?rev=415494&r1=415493&r2=415494&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block_deserializer.c
(original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block_deserializer.c
Mon Jun 19 21:27:06 2006
@@ -21,7 +21,7 @@
 #include <woden_desc_element.h>
 #include <woden_documentation.h>
 #include <woden_documentation_element.h>
-#include "../../../util/woden_om_util.h"
+#include "../../woden_om_util.h"
 #include "../../woden_constants.h"
 #include "woden_soap_constants.h"
 #include <axiom_element.h>
@@ -342,8 +342,13 @@
             WODEN_ATTR_ELEMENT); 
     if(NULL != element_decl_qn)
     {
-        axis2_qname_t *qname = woden_om_util_get_qname(env, ext_el_node, 
-                element_decl_qn, desc);
+        axis2_qname_t *qname = NULL;
+        axis2_hash_t *namespcs = NULL;
+        
+        desc = woden_desc_to_desc_element(desc, env);
+        namespcs = WODEN_DESC_ELEMENT_GET_NAMESPACES(desc, env);
+        qname = woden_om_util_get_qname(env, ext_el_node, 
+                element_decl_qn, namespcs);
         
         soap_hdr = woden_soap_header_block_to_soap_header_block_element(soap_hdr, env);
         WODEN_SOAP_HEADER_BLOCK_ELEMENT_SET_ELEMENT_QNAME(soap_hdr, env, qname);

Copied: webservices/axis2/trunk/c/woden/src/wsdl20/woden_om_util.c (from r414762, webservices/axis2/trunk/c/woden/src/util/woden_om_util.c)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_om_util.c?p2=webservices/axis2/trunk/c/woden/src/wsdl20/woden_om_util.c&p1=webservices/axis2/trunk/c/woden/src/util/woden_om_util.c&r1=414762&r2=415494&rev=415494&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/woden_om_util.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_om_util.c Mon Jun 19 21:27:06 2006
@@ -25,7 +25,7 @@
         const axis2_env_t *env,
         axiom_node_t *context_el_node,
         axis2_char_t *prefixed_value,
-        void *desc)
+        axis2_hash_t *namespcs)
 {
     axis2_char_t *index = NULL;
     axis2_char_t *prefix = "";
@@ -34,6 +34,11 @@
     axiom_element_t *context_el = NULL;
     axiom_namespace_t *namespc_uri = NULL;
 
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK(env->error, context_el_node, NULL);
+    AXIS2_PARAM_CHECK(env->error, prefixed_value, NULL);
+    AXIS2_PARAM_CHECK(env->error, namespcs, NULL);
+
     index = axis2_rindex(prefixed_value, ':');
     localpart = index + 1;
     index[0] = '\0';
@@ -46,7 +51,7 @@
     namespc_uri_str = AXIOM_NAMESPACE_GET_URI(namespc_uri, env);
     if(NULL != namespc_uri_str)
     {
-        woden_om_util_register_unique_prefix(env, prefix, namespc_uri_str, desc);
+        woden_om_util_register_unique_prefix(env, prefix, namespc_uri_str, namespcs);
         return axis2_qname_create(env, localpart, namespc_uri_str, prefix);
     }
     return NULL; 
@@ -57,15 +62,14 @@
         const axis2_env_t *env,
         axis2_char_t *prefix,
         axis2_char_t *namespc_uri_str,
-        void *desc)
+        axis2_hash_t *namespcs)
 {
     axis2_uri_t *ns_uri = NULL;
     axis2_uri_t *uri = NULL;
     axis2_char_t *ns_uri_str = NULL;
     axis2_char_t *tmp_prefix = NULL;
 
-    desc = woden_desc_to_desc_element(desc, env);
-    ns_uri = WODEN_DESC_ELEMENT_GET_NAMESPACE(desc, env, prefix);
+    ns_uri = axis2_hash_get(namespcs, prefix, AXIS2_HASH_KEY_STRING);
     if(ns_uri)
         ns_uri_str = AXIS2_URI_TO_STRING(ns_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
     if(NULL != ns_uri_str && 0 == AXIS2_STRCMP(ns_uri_str, namespc_uri_str))
@@ -79,14 +83,15 @@
         axis2_char_t *temp = NULL;
 
         temp = AXIS2_STRACAT(tmp_prefix, "_", env); 
-        ns_uri = WODEN_DESC_ELEMENT_GET_NAMESPACE(desc, env, temp);
+        ns_uri = axis2_hash_get(namespcs, temp, AXIS2_HASH_KEY_STRING);
         ns_uri_str = AXIS2_URI_TO_STRING(ns_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
         AXIS2_FREE(env->allocator, tmp_prefix);
         tmp_prefix = AXIS2_STRDUP(temp, env);
         AXIS2_FREE(env->allocator, temp);
     }
     uri = axis2_uri_parse_string(env, namespc_uri_str);
+    axis2_hash_set(namespcs, prefix, AXIS2_HASH_KEY_STRING, uri);
     
-    return WODEN_DESC_ELEMENT_ADD_NAMESPACE(desc, env, prefix, uri);
+    return AXIS2_SUCCESS;
 }
  

Copied: webservices/axis2/trunk/c/woden/src/wsdl20/woden_om_util.h (from r414762, webservices/axis2/trunk/c/woden/src/util/woden_om_util.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_om_util.h?p2=webservices/axis2/trunk/c/woden/src/wsdl20/woden_om_util.h&p1=webservices/axis2/trunk/c/woden/src/util/woden_om_util.h&r1=414762&r2=415494&rev=415494&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/woden_om_util.h (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_om_util.h Mon Jun 19 21:27:06 2006
@@ -33,7 +33,6 @@
 #include <axis2_qname.h>
 #include <woden.h>
 #include <axiom_node.h>
-#include <woden_desc.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -50,14 +49,14 @@
         const axis2_env_t *env,
         axiom_node_t *context_el_node,
         axis2_char_t *prefixed_value,
-        void *desc);
+        axis2_hash_t *namespcs);
  
 AXIS2_EXTERN axis2_status_t  AXIS2_CALL
 woden_om_util_register_unique_prefix(
         const axis2_env_t *env,
         axis2_char_t *prefix,
         axis2_char_t *namespc_uri_str,
-        void *desc);
+        axis2_hash_t *namespcs);
  
 
 /** @} */

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/Makefile.am?rev=415494&r1=415493&r2=415494&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/Makefile.am Mon Jun 19 21:27:06 2006
@@ -12,6 +12,7 @@
 							interface_fault_element.c \
 							interface_fault_ref_element.c \
 							interface_msg_ref_element.c \
+							msg_ref_element.c \
 							interface_op_element.c \
 							binding_element.c \
 							binding_fault_element.c \



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