Author: milinda
Date: Sun Jun 10 19:42:35 2007
New Revision: 545994
URL: http://svn.apache.org/viewvc?view=rev&rev=545994
Log:
Change the sample implementations to reflect the changes in naming and removing
macros from generated code.
Modified:
webservices/axis2/trunk/c/samples/codegen/databinding/Calculator/Calculator.wsdl
webservices/axis2/trunk/c/samples/codegen/databinding/Calculator/client/CalculatorAdd.c
webservices/axis2/trunk/c/samples/codegen/databinding/Calculator/server/axis2_skel_Calculator.c
Modified:
webservices/axis2/trunk/c/samples/codegen/databinding/Calculator/Calculator.wsdl
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/codegen/databinding/Calculator/Calculator.wsdl?view=diff&rev=545994&r1=545993&r2=545994
==============================================================================
---
webservices/axis2/trunk/c/samples/codegen/databinding/Calculator/Calculator.wsdl
(original)
+++
webservices/axis2/trunk/c/samples/codegen/databinding/Calculator/Calculator.wsdl
Sun Jun 10 19:42:35 2007
@@ -1,135 +1,255 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2003-2004 The Apache Software Foundation.
-->
-<!--
-->
-<!-- Licensed under the Apache License, Version 2.0 (the "License");
-->
-<!-- you may not use this file except in compliance with the License.
-->
-<!-- You may obtain a copy of the License at
-->
-<!--
-->
-<!-- http://www.apache.org/licenses/LICENSE-2.0
-->
-<!--
-->
-<!-- Unless required by applicable law or agreed to in writing, software
-->
-<!-- distributed under the License is distributed on an "AS IS" BASIS,
-->
-<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-->
-<!-- See the License for the specific language governing permissions and
-->
-<!-- limitations under the License.
-->
-
-<wsdl:definitions targetNamespace="http://localhost/axis/Calculator";
-xmlns="http://schemas.xmlsoap.org/wsdl/";
-xmlns:apachesoap="http://xml.apache.org/xml-soap";
-xmlns:impl="http://localhost/axis/Calculator";
-xmlns:intf="http://localhost/axis/Calculator";
-xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/";
-xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
-xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/";
-xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
- <wsdl:message name="addRequest">
- <wsdl:part name="in0" type="xsd:int"/>
- <wsdl:part name="in1" type="xsd:int"/>
- </wsdl:message>
- <wsdl:message name="addResponse">
- <wsdl:part name="addReturn" type="xsd:int"/>
- </wsdl:message>
- <wsdl:message name="subResponse">
- <wsdl:part name="subReturn" type="xsd:int"/>
- </wsdl:message>
- <wsdl:message name="subRequest">
- <wsdl:part name="in0" type="xsd:int"/>
- <wsdl:part name="in1" type="xsd:int"/>
- </wsdl:message>
- <wsdl:message name="mulRequest">
- <wsdl:part name="in0" type="xsd:int"/>
- <wsdl:part name="in1" type="xsd:int"/>
- </wsdl:message>
- <wsdl:message name="mulResponse">
- <wsdl:part name="addReturn" type="xsd:int"/>
- </wsdl:message>
- <wsdl:message name="divRequest">
- <wsdl:part name="in0" type="xsd:int"/>
- <wsdl:part name="in1" type="xsd:int"/>
- </wsdl:message>
- <wsdl:message name="divResponse">
- <wsdl:part name="addReturn" type="xsd:int"/>
- </wsdl:message>
- <wsdl:portType name="Calculator">
- <wsdl:operation name="add" parameterOrder="in0 in1">
- <wsdl:input message="intf:addRequest" name="addRequest"/>
- <wsdl:output message="intf:addResponse" name="addResponse"/>
- </wsdl:operation>
- <wsdl:operation name="sub" parameterOrder="in0 in1">
- <wsdl:input message="intf:subRequest" name="subRequest"/>
- <wsdl:output message="intf:subResponse" name="subResponse"/>
- </wsdl:operation>
- <wsdl:operation name="mul" parameterOrder="in0 in1">
- <wsdl:input message="intf:mulRequest" name="mulRequest"/>
- <wsdl:output message="intf:mulResponse" name="mulResponse"/>
- </wsdl:operation>
- <wsdl:operation name="div" parameterOrder="in0 in1">
- <wsdl:input message="intf:divRequest" name="divRequest"/>
- <wsdl:output message="intf:divResponse" name="divResponse"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="CalculatorSoapBinding" type="intf:Calculator">
- <wsdlsoap:binding style="rpc"
- transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="add">
- <wsdlsoap:operation soapAction="Calculator#add"/>
- <wsdl:input name="addRequest">
- <wsdlsoap:body
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
- namespace="http://localhost/axis/Calculator";
- use="encoded"/>
- </wsdl:input>
- <wsdl:output name="addResponse">
- <wsdlsoap:body
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
- namespace="http://localhost/axis/Calculator";
- use="encoded"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="sub">
- <wsdlsoap:operation soapAction="Calculator#sub"/>
- <wsdl:input name="subRequest">
- <wsdlsoap:body
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
- namespace="http://localhost/axis/Calculator";
- use="encoded"/>
- </wsdl:input>
- <wsdl:output name="subResponse">
- <wsdlsoap:body
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
- namespace="http://localhost/axis/Calculator";
- use="encoded"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="mul">
- <wsdlsoap:operation soapAction="Calculator#mul"/>
- <wsdl:input name="mulRequest">
- <wsdlsoap:body
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
- namespace="http://localhost/axis/Calculator";
- use="encoded"/>
- </wsdl:input>
- <wsdl:output name="mulResponse">
- <wsdlsoap:body
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
- namespace="http://localhost/axis/Calculator";
- use="encoded"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="div">
- <wsdlsoap:operation soapAction="Calculator#div"/>
- <wsdl:input name="divRequest">
- <wsdlsoap:body
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
- namespace="http://localhost/axis/Calculator";
- use="encoded"/>
- </wsdl:input>
- <wsdl:output name="divResponse">
- <wsdlsoap:body
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
- namespace="http://localhost/axis/Calculator";
- use="encoded"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="Calculator">
- <wsdl:port binding="intf:CalculatorSoapBinding" name="Calculator">
- <wsdlsoap:address location="http://localhost/axis/Calculator"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2003-2004 The Apache Software Foundation.
-->
+<!-- (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved
-->
+<!--
-->
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
-->
+<!-- you may not use this file except in compliance with the License.
-->
+<!-- You may obtain a copy of the License at
-->
+<!--
-->
+<!-- http://www.apache.org/licenses/LICENSE-2.0
-->
+<!--
-->
+<!-- Unless required by applicable law or agreed to in writing, software
-->
+<!-- distributed under the License is distributed on an "AS IS" BASIS,
-->
+<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-->
+<!-- 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: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/";>
+ <element name="add">
+ <complexType>
+ <sequence>
+ <element name="arg_0_0" type="xsd:int"/>
+ <element name="arg_1_0" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="addResponse">
+ <complexType>
+ <sequence>
+ <element name="addReturn" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="sub">
+ <complexType>
+ <sequence>
+ <element name="arg_0_1" type="xsd:int"/>
+ <element name="arg_1_1" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="subResponse">
+ <complexType>
+ <sequence>
+ <element name="subReturn" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="mul">
+ <complexType>
+ <sequence>
+ <element name="arg_0_2" type="xsd:int"/>
+ <element name="arg_1_2" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="mulResponse">
+ <complexType>
+ <sequence>
+ <element name="mulReturn" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="div">
+ <complexType>
+ <sequence>
+ <element name="arg_0_3" type="xsd:int"/>
+ <element name="arg_1_3" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="divResponse">
+ <complexType>
+ <sequence>
+ <element name="divReturn" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ </wsdl:types>
+
+ <wsdl:message name="subResponse">
+
+ <wsdl:part element="impl:subResponse" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="mulResponse">
+
+ <wsdl:part element="impl:mulResponse" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="subRequest">
+
+ <wsdl:part element="impl:sub" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="divRequest">
+
+ <wsdl:part element="impl:div" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="divResponse">
+
+ <wsdl:part element="impl:divResponse" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="mulRequest">
+
+ <wsdl:part element="impl:mul" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="addResponse">
+
+ <wsdl:part element="impl:addResponse" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="addRequest">
+
+ <wsdl:part element="impl:add" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:portType name="Calculator">
+
+ <wsdl:operation name="add">
+
+ <wsdl:input message="impl:addRequest" name="addRequest"/>
+
+ <wsdl:output message="impl:addResponse" name="addResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="sub">
+
+ <wsdl:input message="impl:subRequest" name="subRequest"/>
+
+ <wsdl:output message="impl:subResponse" name="subResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="mul">
+
+ <wsdl:input message="impl:mulRequest" name="mulRequest"/>
+
+ <wsdl:output message="impl:mulResponse" name="mulResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="div">
+
+ <wsdl:input message="impl:divRequest" name="divRequest"/>
+
+ <wsdl:output message="impl:divResponse" name="divResponse"/>
+
+ </wsdl:operation>
+
+ </wsdl:portType>
+
+ <wsdl:binding name="CalculatorSoapBinding" type="impl:Calculator">
+
+ <wsdlsoap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="add">
+
+ <wsdlsoap:operation soapAction="Calculator#add"/>
+
+ <wsdl:input name="addRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="addResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="sub">
+
+ <wsdlsoap:operation soapAction="Calculator#sub"/>
+
+ <wsdl:input name="subRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="subResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="mul">
+
+ <wsdlsoap:operation soapAction="Calculator#mul"/>
+
+ <wsdl:input name="mulRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="mulResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="div">
+
+ <wsdlsoap:operation soapAction="Calculator#div"/>
+
+ <wsdl:input name="divRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="divResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ </wsdl:binding>
+
+ <wsdl:service name="Calculator">
+
+ <wsdl:port binding="impl:CalculatorSoapBinding" name="Calculator">
+
+ <wsdlsoap:address location="http://localhost/axis/Calculator"/>
+
+ </wsdl:port>
+
+ </wsdl:service>
+
+</wsdl:definitions>
Modified:
webservices/axis2/trunk/c/samples/codegen/databinding/Calculator/client/CalculatorAdd.c
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/codegen/databinding/Calculator/client/CalculatorAdd.c?view=diff&rev=545994&r1=545993&r2=545994
==============================================================================
---
webservices/axis2/trunk/c/samples/codegen/databinding/Calculator/client/CalculatorAdd.c
(original)
+++
webservices/axis2/trunk/c/samples/codegen/databinding/Calculator/client/CalculatorAdd.c
Sun Jun 10 19:42:35 2007
@@ -26,8 +26,8 @@
add_in = axis2_add_create(env);
- AXIS2_ADD_SET_IN0(add_in, env, 10);
- AXIS2_ADD_SET_IN1(add_in, env, 10);
+ axis2_add_set_arg_0_0(add_in, env, 10);
+ axis2_add_set_arg_1_0(add_in, env, 10);
add_res = axis2_stub_Calculator_add(stub, env, add_in);
@@ -37,7 +37,7 @@
return -1;
}
- res_val = AXIS2_ADDRESPONSE_GET_ADDRETURN(add_res, env);
+ res_val = axis2_addResponse_get_addReturn(add_res, env);
printf("ADD Result:%d ", res_val);
Modified:
webservices/axis2/trunk/c/samples/codegen/databinding/Calculator/server/axis2_skel_Calculator.c
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/codegen/databinding/Calculator/server/axis2_skel_Calculator.c?view=diff&rev=545994&r1=545993&r2=545994
==============================================================================
---
webservices/axis2/trunk/c/samples/codegen/databinding/Calculator/server/axis2_skel_Calculator.c
(original)
+++
webservices/axis2/trunk/c/samples/codegen/databinding/Calculator/server/axis2_skel_Calculator.c
Sun Jun 10 19:42:35 2007
@@ -29,13 +29,13 @@
int val1 = 0;
int val2 = 0;
- val1 = AXIS2_ADD_GET_IN0(add, env);
- val2 = AXIS2_ADD_GET_IN1(add, env);
+ val1 = axis2_add_get_arg_0_0(add, env);
+ val2 = axis2_add_get_arg_1_0(add, env);
ret_val = val1 + val2;
add_res = axis2_addResponse_create(env);
- AXIS2_ADDRESPONSE_SET_ADDRETURN(add_res, env, ret_val);
+ axis2_addResponse_set_addReturn(add_res, env, ret_val);
return add_res;
}
@@ -56,13 +56,13 @@
int val1 = 0;
int val2 = 0;
- val1 = AXIS2_DIV_GET_IN0(div, env);
- val2 = AXIS2_DIV_GET_IN1(div, env);
+ val1 = axis2_div_get_arg_0_3(div, env);
+ val2 = axis2_div_get_arg_1_3(div, env);
ret_val = val1/val2;
div_res = axis2_divResponse_create(env);
- AXIS2_DIVRESPONSE_SET_ADDRETURN(div_res, env, ret_val);
+ axis2_divResponse_set_divReturn(div_res, env, ret_val);
return div_res;
}
@@ -85,13 +85,13 @@
int val1 = 0;
int val2 = 0;
- val1 = AXIS2_SUB_GET_IN0(sub, env);
- val2 = AXIS2_SUB_GET_IN1(sub, env);
+ val1 = axis2_sub_get_arg_0_1(sub, env);
+ val2 = axis2_sub_get_arg_1_1(sub, env);
ret_val = val1 - val2;
sub_res = axis2_subResponse_create(env);
- AXIS2_SUBRESPONSE_SET_SUBRETURN(sub_res, env, ret_val);
+ axis2_subResponse_set_subReturn(sub_res, env, ret_val);
return sub_res;
}
@@ -114,13 +114,13 @@
int val1 = 0;
int val2 = 0;
- val1 = AXIS2_MUL_GET_IN0(mul, env);
- val2 = AXIS2_MUL_GET_IN1(mul, env);
+ val1 = axis2_mul_get_arg_0_2(mul, env);
+ val2 = axis2_mul_get_arg_1_2(mul, env);
ret_val = val1*val2;
mul_res = axis2_mulResponse_create(env);
- AXIS2_MULRESPONSE_SET_ADDRETURN(mul_res, env, ret_val);
+ axis2_mulResponse_set_mulReturn(mul_res, env, ret_val);
return mul_res;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
