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/06 11:19:21 UTC

svn commit: r419496 - in /webservices/axis2/trunk/c/woden: include/ src/builder/wsdl10/ src/wsdl10/ src/wsdl10/extensions/soap/

Author: damitha
Date: Thu Jul  6 02:19:20 2006
New Revision: 419496

URL: http://svn.apache.org/viewvc?rev=419496&view=rev
Log:
more refacoring

Added:
    webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h
      - copied, changed from r419457, webservices/axis2/trunk/c/woden/src/wsdl10/woden_constants.h
Removed:
    webservices/axis2/trunk/c/woden/src/wsdl10/woden_constants.h
Modified:
    webservices/axis2/trunk/c/woden/include/woden_binding_op.h
    webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_header_block_deserializer.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c

Modified: webservices/axis2/trunk/c/woden/include/woden_binding_op.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_op.h?rev=419496&r1=419495&r2=419496&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_op.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_op.h Thu Jul  6 02:19:20 2006
@@ -199,16 +199,16 @@
 #define WODEN_BINDING_OP_GET_BASE_IMPL(binding_op, env) \
       (((woden_binding_op_t *) binding_op)->ops->get_base_impl(binding_op, env))
 
-#define WODEN_BINDING_OP_GET_GET_INTERFACE_OP(binding_op, env) \
-      (((woden_binding_op_t *) binding_op)->\
+#define WODEN_BINDING_OP_GET_INTERFACE_OP(binding_op, env) \
+      (((woden_binding_op_t *) binding_op)->ops->\
          get_interface_op(binding_op, env))
 
 #define WODEN_BINDING_OP_GET_BINDING_MSG_REFS(binding_op, env) \
-      (((woden_binding_op_t *) binding_op)->\
+      (((woden_binding_op_t *) binding_op)->ops->\
          get_binding_msg_refs(binding_op, env))
 
 #define WODEN_BINDING_OP_GET_BINDING_FAULT_REFS(binding_op, env) \
-      (((woden_binding_op_t *) binding_op)->\
+      (((woden_binding_op_t *) binding_op)->ops->\
          get_binding_fault_refs(binding_op, env))
 
 #define WODEN_BINDING_OP_TO_ELEMENT(binding_op, env) \

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?rev=419496&r1=419495&r2=419496&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c Thu Jul  6 02:19:20 2006
@@ -100,7 +100,7 @@
 
 #include <woden_wsdl10_ext_deserializer.h>
 
-#include "../../wsdl10/woden_constants.h"
+#include "../../wsdl10/woden_wsdl10_constants.h"
 #include "../../util/woden_om_util.h"
 
 #include <xml_schema.h>
@@ -642,7 +642,7 @@
     AXIS2_PARAM_CHECK(env->error, desc_el_node, NULL);
     reader_impl = INTF_TO_IMPL(reader);
 
-    qname = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DESCRIPTION);
+    qname = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DEFINITIONS);
     check_element_qname(reader, env, desc_el_node, qname);
     
     desc = woden_wsdl10_desc_create(env);
@@ -3817,7 +3817,7 @@
             return NULL;
         }
         /* The referenced document should contain a WSDL <description> */
-        qname = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DESCRIPTION);
+        qname = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DEFINITIONS);
         if(AXIS2_TRUE != axis2_qname_util_matches(env, qname, doc_el_node))
         {
             /* Cannot continue without a <description> element */

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_header_block_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_header_block_deserializer.c?rev=419496&r1=419495&r2=419496&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_header_block_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_header_block_deserializer.c Thu Jul  6 02:19:20 2006
@@ -22,7 +22,7 @@
 #include <woden_documentation.h>
 #include <woden_documentation_element.h>
 #include "../../../util/woden_om_util.h"
-#include "../../woden_constants.h"
+#include "../../woden_wsdl10_constants.h"
 #include "woden_wsdl10_soap_constants.h"
 #include <axiom_element.h>
 #include <axiom_util.h>

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c?rev=419496&r1=419495&r2=419496&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c Thu Jul  6 02:19:20 2006
@@ -21,7 +21,7 @@
 #include <woden_wsdl10_desc_element.h>
 #include <woden_documentation.h>
 #include <woden_documentation_element.h>
-#include "../../woden_constants.h"
+#include "../../woden_wsdl10_constants.h"
 #include <axiom_element.h>
 #include <axiom_util.h>
 #include <woden_qname_util.h>

Copied: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h (from r419457, webservices/axis2/trunk/c/woden/src/wsdl10/woden_constants.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h?p2=webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h&p1=webservices/axis2/trunk/c/woden/src/wsdl10/woden_constants.h&r1=419457&r2=419496&rev=419496&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_constants.h (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h Thu Jul  6 02:19:20 2006
@@ -41,7 +41,7 @@
 #define WODEN_NS_URI_XSI "http://www.w3.org/2001/XMLSchema-instance"
 
 /* Top-level WSDL 2.0 element names. */
-#define WODEN_ELEM_DESCRIPTION "description"
+#define WODEN_ELEM_DEFINITIONS "description"
 #define WODEN_ELEM_DOCUMENTATION "documentation"
 #define WODEN_ELEM_IMPORT "import"
 #define WODEN_ELEM_INCLUDE "include"
@@ -65,7 +65,7 @@
 #define WODEN_ELEM_PART "part"
 
 /* Top-level WSDL 2.0 qualified element names. */
-#define WODEN_Q_ELEM_DESCRIPTION "definitions|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_Q_ELEM_DEFINITIONS "definitions|http://schemas.xmlsoap.org/wsdl"
 #define WODEN_Q_ELEM_DOCUMENTATION "documentation|http://schemas.xmlsoap.org/wsdl"
 #define WODEN_Q_ELEM_IMPORT "import|http://schemas.xmlsoap.org/wsdl"
 #define WODEN_Q_ELEM_INCLUDE "include|http://schemas.xmlsoap.org/wsdl"



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