axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r450469 - in /webservices/axis2/trunk/c/woden/src: builder/wsdl10/wsdl10_reader.c wsdl10/extensions/soap/woden_wsdl10_soap_constants.h wsdl10/extensions/soap/wsdl10_soap_module_deserializer.c wsdl10/woden_wsdl10_constants.h
Date Wed, 27 Sep 2006 15:05:34 GMT
Author: nandika
Date: Wed Sep 27 08:05:34 2006
New Revision: 450469

URL: http://svn.apache.org/viewvc?view=rev&rev=450469
Log:
changes for wsdl spec constants: used in codegen

Modified:
    webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_constants.h
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/wsdl10_soap_module_deserializer.c
    webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h

Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c?view=diff&rev=450469&r1=450468&r2=450469
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c Wed Sep 27 08:05:34
2006
@@ -2904,7 +2904,9 @@
                         int_msg_ref, env);
             msg_ref = woden_wsdl10_binding_msg_ref_to_binding_msg_ref_element(msg_ref, env);
             binding_msg_qname = WODEN_WSDL10_BINDING_MSG_REF_ELEMENT_GET_QNAME(msg_ref, env);
-            if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(intf_msg_qname, env, binding_msg_qname))
+            if(intf_msg_qname != NULL &&
+                    binding_msg_qname != NULL &&
+                    AXIS2_TRUE == AXIS2_QNAME_EQUALS(intf_msg_qname, env, binding_msg_qname))
             {
                 WODEN_WSDL10_BINDING_MSG_REF_SET_INTERFACE_MSG_REF_ELEMENT(
                     msg_ref, env, int_msg_ref);

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_constants.h?view=diff&rev=450469&r1=450468&r2=450469
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_constants.h
(original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_constants.h
Wed Sep 27 08:05:34 2006
@@ -37,7 +37,7 @@
 /*********************************** Constansts********************************/
 
 /* Namespace URIs.*/
-#define WODEN_WSDL10_NS_URI_SOAP "http://schemas.xmlsoap.org/wsdl/soap"
+#define WODEN_WSDL10_NS_URI_SOAP "http://schemas.xmlsoap.org/wsdl/soap/"
 
 /* Protocol URIs.*/
 #define WODEN_WSDL10_PROTOCOL_URI_HTTP "http://www.w3.org/2003/05/soap/bindings/HTTP/"
@@ -63,25 +63,25 @@
 
 /* Qualified element names.*/
 
-#define WODEN_WSDL10_Q_ELEM_SOAP_MODULE "module|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ELEM_SOAP_MODULE "module|http://schemas.xmlsoap.org/wsdl/soap|wsoap/"
 
-#define WODEN_WSDL10_Q_ELEM_SOAP_HEADER "header|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ELEM_SOAP_HEADER "header|http://schemas.xmlsoap.org/wsdl/soap|wsoap/"
 
 /* Qualified attribute names.*/
 
-#define WODEN_WSDL10_Q_ATTR_SOAP_VERSION "version|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ATTR_SOAP_VERSION "version|http://schemas.xmlsoap.org/wsdl/soap|wsoap/"
 
-#define WODEN_WSDL10_Q_ATTR_SOAP_PROTOCOL "protocol|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ATTR_SOAP_PROTOCOL "protocol|http://schemas.xmlsoap.org/wsdl/soap|wsoap/"
 
-#define WODEN_WSDL10_Q_ATTR_SOAP_MEPDEFAULT "mepDefault|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ATTR_SOAP_MEPDEFAULT "mepDefault|http://schemas.xmlsoap.org/wsdl/soap|wsoap/"
 
-#define WODEN_WSDL10_Q_ATTR_SOAP_CODE "ATTR_CODE|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ATTR_SOAP_CODE "ATTR_CODE|http://schemas.xmlsoap.org/wsdl/soap|wsoap/"
 
-#define WODEN_WSDL10_Q_ATTR_SOAP_SUBCODES "subcodes|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ATTR_SOAP_SUBCODES "subcodes|http://schemas.xmlsoap.org/wsdl/soap|wsoap/"
 
-#define WODEN_WSDL10_Q_ATTR_SOAP_MEP "mep|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ATTR_SOAP_MEP "mep|http://schemas.xmlsoap.org/wsdl/soap|wsoap/"
 
-#define WODEN_WSDL10_Q_ATTR_SOAP_ACTION "action|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ATTR_SOAP_ACTION "action|http://schemas.xmlsoap.org/wsdl/soap|wsoap/"
 
 
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/wsdl10_soap_module_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/wsdl10_soap_module_deserializer.c?view=diff&rev=450469&r1=450468&r2=450469
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/wsdl10_soap_module_deserializer.c
(original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/wsdl10_soap_module_deserializer.c
Wed Sep 27 08:05:34 2006
@@ -377,7 +377,11 @@
         binding_op_exts = woden_wsdl10_soap_binding_op_exts_create(env);
         WODEN_WSDL10_SOAP_BINDING_OP_EXTS_SET_SOAP_ACTION(binding_op_exts,
                 env, soap_action);
-        AXIS2_URI_FREE(soap_action, env);
+        if( soap_action != NULL)
+        {
+            AXIS2_URI_FREE(soap_action, env);
+        }
+
 
         soap_mod = woden_wsdl10_soap_module_to_soap_module_element(soap_mod,
                 env);

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h?view=diff&rev=450469&r1=450468&r2=450469
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h Wed Sep 27 08:05:34
2006
@@ -36,7 +36,7 @@
   */
 /*********************************** Constansts********************************/
 /* Namespace URIs. */
-#define WODEN_WSDL10_NS_URI_WSDL20 "http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_NS_URI_WSDL20 "http://schemas.xmlsoap.org/wsdl/"
 #define WODEN_WSDL10_NS_URI_XMLNS "http://www.w3.org/2000/xmlns/"
 #define WODEN_WSDL10_NS_URI_XSI "http://www.w3.org/2001/XMLSchema-instance"
 
@@ -65,30 +65,30 @@
 #define WODEN_WSDL10_ELEM_PART "part"
 
 /* Top-level WSDL 2.0 qualified element names. */
-#define WODEN_WSDL10_Q_ELEM_DEFINITIONS "definitions|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_DOCUMENTATION "documentation|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_ACTION "action|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_IMPORT "import|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_INCLUDE "include|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_TYPES "types|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_MSG_REF "message|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_PART "part|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_INTERFACE "portType|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_BINDING "binding|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_SERVICE "service|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_DEFINITIONS "definitions|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_DOCUMENTATION "documentation|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_ACTION "action|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_IMPORT "import|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_INCLUDE "include|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_TYPES "types|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_MSG_REF "message|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_PART "part|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_INTERFACE "portType|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_BINDING "binding|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_SERVICE "service|http://schemas.xmlsoap.org/wsdl/"
 
 /* Nested WSDL 2.0 qualified element names. */
-#define WODEN_WSDL10_Q_ELEM_FAULT "fault|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_OPERATION "operation|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_INPUT "input|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_OUTPUT "output|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_INFAULT "infault|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_OUTFAULT "outfault|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_FEATURE "feature|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_PROPERTY "property|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_VALUE "value|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_CONSTRAINT "constraint|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_WSDL10_Q_ELEM_ENDPOINT "port|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_FAULT "fault|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_OPERATION "operation|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_INPUT "input|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_OUTPUT "output|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_INFAULT "infault|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_OUTFAULT "outfault|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_FEATURE "feature|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_PROPERTY "property|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_VALUE "value|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_CONSTRAINT "constraint|http://schemas.xmlsoap.org/wsdl/"
+#define WODEN_WSDL10_Q_ELEM_ENDPOINT "port|http://schemas.xmlsoap.org/wsdl/"
 
 /* Attribute names. */
 #define WODEN_WSDL10_ATTR_ID "id"
@@ -137,7 +137,7 @@
 
 
 /* Qualified attribute names.*/
-#define WODEN_WSDL10_Q_ATTR_REQUIRED "required|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ATTR_REQUIRED "required|http://schemas.xmlsoap.org/wsdl/"
 
 /* XML Declaration string.*/
 #define WODEN_WSDL10_XML_DECL_DEFAULT "UTF-8"



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