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/10/12 10:31:18 UTC

svn commit: r463155 - in /webservices/axis2/trunk/c/woden: samples/wsdl10/CalculatorDoc.wsdl src/wsdl/soap_fault_code.c src/wsdl/soap_fault_subcodes.c src/wsdl10/woden_wsdl10_constants.h

Author: damitha
Date: Thu Oct 12 01:31:14 2006
New Revision: 463155

URL: http://svn.apache.org/viewvc?view=rev&rev=463155
Log:
Fixed the Calculator sample segfault

Modified:
    webservices/axis2/trunk/c/woden/samples/wsdl10/CalculatorDoc.wsdl
    webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_code.c
    webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_subcodes.c
    webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h

Modified: webservices/axis2/trunk/c/woden/samples/wsdl10/CalculatorDoc.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/wsdl10/CalculatorDoc.wsdl?view=diff&rev=463155&r1=463154&r2=463155
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/wsdl10/CalculatorDoc.wsdl (original)
+++ webservices/axis2/trunk/c/woden/samples/wsdl10/CalculatorDoc.wsdl Thu Oct 12 01:31:14 2006
@@ -14,9 +14,9 @@
 <!-- See the License for the specific language governing permissions and      -->
 <!-- limitations under the License.                                           -->
 
-<wsdl:definitions targetNamespace="http://localhost/axis/Calculator" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://localhost/axis/Calculator" xmlns:intf="http://localhost/axis/Calculator" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<wsdl:definitions targetNamespace="http://localhost/axis/Calculator" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://localhost/axis/Calculator" xmlns:intf="http://localhost/axis/Calculator" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
  <wsdl:types>
-  <schema elementFormDefault="qualified" targetNamespace="http://localhost/axis/Calculator" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://localhost/axis/Calculator" xmlns:intf="http://localhost/axis/Calculator" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <schema elementFormDefault="qualified" targetNamespace="http://localhost/axis/Calculator" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://localhost/axis/Calculator" xmlns:intf="http://localhost/axis/Calculator" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl">
    <element name="add">
     <complexType>
      <sequence>

Modified: webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_code.c?view=diff&rev=463155&r1=463154&r2=463155
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_code.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_code.c Thu Oct 12 01:31:14 2006
@@ -167,7 +167,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     soap_fault_code_impl = INTF_TO_IMPL(soap_fault_code);
 
-    return (soap_fault_code_impl->f_code_qn);
+    return (NULL != soap_fault_code_impl->f_code_qn);
 }
 
 axis2_bool_t AXIS2_CALL
@@ -180,7 +180,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     soap_fault_code_impl = INTF_TO_IMPL(soap_fault_code);
 
-    return (soap_fault_code_impl->f_token);
+    return (NULL != soap_fault_code_impl->f_token);
 }
 
 axis2_qname_t *AXIS2_CALL

Modified: webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_subcodes.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_subcodes.c?view=diff&rev=463155&r1=463154&r2=463155
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_subcodes.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_subcodes.c Thu Oct 12 01:31:14 2006
@@ -191,7 +191,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     soap_fault_subcodes_impl = INTF_TO_IMPL(soap_fault_subcodes);
 
-    return (soap_fault_subcodes_impl->f_token);
+    return (NULL != soap_fault_subcodes_impl->f_token);
 }
 
 axis2_array_list_t *AXIS2_CALL

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=463155&r1=463154&r2=463155
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h Thu Oct 12 01:31:14 2006
@@ -20,7 +20,7 @@
 /**
  * @file woden_constants.h
  * @brief Axis2 Xml Woden Constants
- * Constants for WSDL 2.0 elements, attributes and URIs.
+ * Constants for WSDL 1.0 elements, attributes and URIs.
  */
  
 #include <axis2_utils.h>
@@ -40,7 +40,7 @@
 #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"
 
-/* Top-level WSDL 2.0 element names. */
+/* Top-level WSDL 1.0 element names. */
 #define WODEN_WSDL10_ELEM_DEFINITIONS "description"
 #define WODEN_WSDL10_ELEM_DOCUMENTATION "documentation"
 #define WODEN_WSDL10_ELEM_IMPORT "import"
@@ -50,7 +50,7 @@
 #define WODEN_WSDL10_ELEM_BINDING "binding"
 #define WODEN_WSDL10_ELEM_SERVICE "service"
 
-/* Nested WSDL 2.0 element names. */
+/* Nested WSDL 1.0 element names. */
 #define WODEN_WSDL10_ELEM_FAULT "fault"
 #define WODEN_WSDL10_ELEM_OPERATION "operation"
 #define WODEN_WSDL10_ELEM_INPUT "input"
@@ -64,31 +64,31 @@
 #define WODEN_WSDL10_ELEM_ENDPOINT "port"
 #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/"
-
-/* 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/"
+/* Top-level WSDL 1.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"
+
+/* Nested WSDL 1.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"
 
 /* Attribute names. */
 #define WODEN_WSDL10_ATTR_ID "id"
@@ -122,7 +122,7 @@
 #define WODEN_WSDL10_NMTOKEN_ELEMENT "#element"
 
 /* Constants representing the values of the properties used to 
- * configure the Woden runtime (i.e. different to WSDL 2.0 properties).
+ * configure the Woden runtime (i.e. different to WSDL 1.0 properties).
  * These typically describe the standards, APIs, etc, supported by this 
  * implementation of the Woden API.
  * 



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