You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by mv...@apache.org on 2006/10/11 09:48:17 UTC
svn commit: r462752 - in /incubator/yoko/trunk/tools/src/test/resources/idl:
Typedef.idl expected_Typedef.wsdl
Author: mvescovi
Date: Wed Oct 11 02:48:16 2006
New Revision: 462752
URL: http://svn.apache.org/viewvc?view=rev&rev=462752
Log:
[YOKO-190] Fixes for testTypedefGeneration(org.apache.yoko.tools.processors.IDLToWSDLGenerationTest) failing.
Modified:
incubator/yoko/trunk/tools/src/test/resources/idl/Typedef.idl
incubator/yoko/trunk/tools/src/test/resources/idl/expected_Typedef.wsdl
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/Typedef.idl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/Typedef.idl?view=diff&rev=462752&r1=462751&r2=462752
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/Typedef.idl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/Typedef.idl Wed Oct 11 02:48:16 2006
@@ -93,7 +93,7 @@
void opIn(
- in myFloat inMyFloat,
+ in myFloat inMyFloat,
in myDouble inMyDouble,
in myFloat inMyFloat,
in myDouble inMyDouble,
@@ -125,7 +125,7 @@
);
void opOut(
- out myFloat outMyFloat,
+ out myFloat outMyFloat,
out myDouble outMyDouble,
out myFloat outMyFloat,
out myDouble outMyDouble,
@@ -157,7 +157,7 @@
);
void opInOut(
- inout myFloat inoutMyFloat,
+ inout myFloat inoutMyFloat,
inout myDouble inoutMyDouble,
inout myFloat inoutMyFloat,
inout myDouble inoutMyDouble,
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Typedef.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Typedef.wsdl?view=diff&rev=462752&r1=462751&r2=462752
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Typedef.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Typedef.wsdl Wed Oct 11 02:48:16 2006
@@ -316,18 +316,162 @@
<xs:element name="opOutResponse">
<xs:complexType>
<xs:sequence>
+ <xs:element name="outMyFloat" type="myFloat">
+ </xs:element>
+ <xs:element name="outMyDouble" type="myDouble">
+ </xs:element>
+ <xs:element name="outMyFloat" type="myFloat">
+ </xs:element>
+ <xs:element name="outMyDouble" type="myDouble">
+ </xs:element>
+ <xs:element name="outMyLongDouble" type="myLongDouble">
+ </xs:element>
+ <xs:element name="outMyShort" type="myShort">
+ </xs:element>
+ <xs:element name="outMyLong" type="myLong">
+ </xs:element>
+ <xs:element name="outMyLongLong" type="myLongLong">
+ </xs:element>
+ <xs:element name="outMyUnsignedShort" type="myUnsignedShort">
+ </xs:element>
+ <xs:element name="outMyUnsignedLong" type="myUnsignedLong">
+ </xs:element>
+ <xs:element name="outMyUnsignedLongLong" type="myUnsignedLongLong">
+ </xs:element>
+ <xs:element name="outMyChar" type="myChar">
+ </xs:element>
+ <xs:element name="outMyWChar" type="myWChar">
+ </xs:element>
+ <xs:element name="outMyBoolean" type="myBoolean">
+ </xs:element>
+ <xs:element name="outMyOctet" type="myOctet">
+ </xs:element>
+ <xs:element name="outMySeqLong" type="mySeqLong">
+ </xs:element>
+ <xs:element name="outMyString" type="myString">
+ </xs:element>
+ <xs:element name="outMyFixed52" type="myFixed52">
+ </xs:element>
+ <xs:element name="outMyStruct" type="myStruct">
+ </xs:element>
+ <xs:element name="outMyEnum" type="myEnum">
+ </xs:element>
+ <xs:element name="outMyUnion" type="myUnion">
+ </xs:element>
+ <xs:element name="outMyOtherStruct" type="myOtherStruct">
+ </xs:element>
+ <xs:element name="outMyOtherEnum" type="myOtherEnum">
+ </xs:element>
+ <xs:element name="outMyOtherUnion" type="myOtherUnion">
+ </xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="opInOut">
<xs:complexType>
<xs:sequence>
+ <xs:element name="inoutMyFloat" type="myFloat">
+ </xs:element>
+ <xs:element name="inoutMyDouble" type="myDouble">
+ </xs:element>
+ <xs:element name="inoutMyFloat" type="myFloat">
+ </xs:element>
+ <xs:element name="inoutMyDouble" type="myDouble">
+ </xs:element>
+ <xs:element name="inoutMyLongDouble" type="myLongDouble">
+ </xs:element>
+ <xs:element name="inoutMyShort" type="myShort">
+ </xs:element>
+ <xs:element name="inoutMyLong" type="myLong">
+ </xs:element>
+ <xs:element name="inoutMyLongLong" type="myLongLong">
+ </xs:element>
+ <xs:element name="inoutMyUnsignedShort" type="myUnsignedShort">
+ </xs:element>
+ <xs:element name="inoutMyUnsignedLong" type="myUnsignedLong">
+ </xs:element>
+ <xs:element name="inoutMyUnsignedLongLong" type="myUnsignedLongLong">
+ </xs:element>
+ <xs:element name="inoutMyChar" type="myChar">
+ </xs:element>
+ <xs:element name="inoutMyWChar" type="myWChar">
+ </xs:element>
+ <xs:element name="inoutMyBoolean" type="myBoolean">
+ </xs:element>
+ <xs:element name="inoutMyOctet" type="myOctet">
+ </xs:element>
+ <xs:element name="inoutMySeqLong" type="mySeqLong">
+ </xs:element>
+ <xs:element name="inoutMyString" type="myString">
+ </xs:element>
+ <xs:element name="inoutMyFixed52" type="myFixed52">
+ </xs:element>
+ <xs:element name="inoutMyStruct" type="myStruct">
+ </xs:element>
+ <xs:element name="inoutMyEnum" type="myEnum">
+ </xs:element>
+ <xs:element name="inoutMyUnion" type="myUnion">
+ </xs:element>
+ <xs:element name="inoutMyOtherStruct" type="myOtherStruct">
+ </xs:element>
+ <xs:element name="inoutMyOtherEnum" type="myOtherEnum">
+ </xs:element>
+ <xs:element name="inoutMyOtherUnion" type="myOtherUnion">
+ </xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="opInOutResponse">
<xs:complexType>
<xs:sequence>
+ <xs:element name="inoutMyFloat" type="myFloat">
+ </xs:element>
+ <xs:element name="inoutMyDouble" type="myDouble">
+ </xs:element>
+ <xs:element name="inoutMyFloat" type="myFloat">
+ </xs:element>
+ <xs:element name="inoutMyDouble" type="myDouble">
+ </xs:element>
+ <xs:element name="inoutMyLongDouble" type="myLongDouble">
+ </xs:element>
+ <xs:element name="inoutMyShort" type="myShort">
+ </xs:element>
+ <xs:element name="inoutMyLong" type="myLong">
+ </xs:element>
+ <xs:element name="inoutMyLongLong" type="myLongLong">
+ </xs:element>
+ <xs:element name="inoutMyUnsignedShort" type="myUnsignedShort">
+ </xs:element>
+ <xs:element name="inoutMyUnsignedLong" type="myUnsignedLong">
+ </xs:element>
+ <xs:element name="inoutMyUnsignedLongLong" type="myUnsignedLongLong">
+ </xs:element>
+ <xs:element name="inoutMyChar" type="myChar">
+ </xs:element>
+ <xs:element name="inoutMyWChar" type="myWChar">
+ </xs:element>
+ <xs:element name="inoutMyBoolean" type="myBoolean">
+ </xs:element>
+ <xs:element name="inoutMyOctet" type="myOctet">
+ </xs:element>
+ <xs:element name="inoutMySeqLong" type="mySeqLong">
+ </xs:element>
+ <xs:element name="inoutMyString" type="myString">
+ </xs:element>
+ <xs:element name="inoutMyFixed52" type="myFixed52">
+ </xs:element>
+ <xs:element name="inoutMyStruct" type="myStruct">
+ </xs:element>
+ <xs:element name="inoutMyEnum" type="myEnum">
+ </xs:element>
+ <xs:element name="inoutMyUnion" type="myUnion">
+ </xs:element>
+ <xs:element name="inoutMyOtherStruct" type="myOtherStruct">
+ </xs:element>
+ <xs:element name="inoutMyOtherEnum" type="myOtherEnum">
+ </xs:element>
+ <xs:element name="inoutMyOtherUnion" type="myOtherUnion">
+ </xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -400,14 +544,64 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="opOut">
- <corba:operation name="opOut" />
+ <corba:operation name="opOut">
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyFloat" idltype="myFloat" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyDouble" idltype="myDouble" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyFloat" idltype="myFloat" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyDouble" idltype="myDouble" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyLongDouble" idltype="myLongDouble" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyShort" idltype="myShort" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyLong" idltype="myLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyLongLong" idltype="myLongLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyUnsignedShort" idltype="myUnsignedShort" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyUnsignedLong" idltype="myUnsignedLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyUnsignedLongLong" idltype="myUnsignedLongLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyChar" idltype="myChar" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyWChar" idltype="myWChar" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyBoolean" idltype="myBoolean" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyOctet" idltype="myOctet" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMySeqLong" idltype="mySeqLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyString" idltype="myString" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyFixed52" idltype="myFixed52" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyStruct" idltype="myStruct" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyEnum" idltype="myEnum" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyUnion" idltype="myUnion" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyOtherStruct" idltype="myOtherStruct" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyOtherEnum" idltype="myOtherEnum" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyOtherUnion" idltype="myOtherUnion" />
+ </corba:operation>
<wsdl:input name="opOutRequest">
</wsdl:input>
<wsdl:output name="opOutResponse">
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="opInOut">
- <corba:operation name="opInOut" />
+ <corba:operation name="opInOut">
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyFloat" idltype="myFloat" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyDouble" idltype="myDouble" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyFloat" idltype="myFloat" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyDouble" idltype="myDouble" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyLongDouble" idltype="myLongDouble" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyShort" idltype="myShort" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyLong" idltype="myLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyLongLong" idltype="myLongLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyUnsignedShort" idltype="myUnsignedShort" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyUnsignedLong" idltype="myUnsignedLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyUnsignedLongLong" idltype="myUnsignedLongLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyChar" idltype="myChar" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyWChar" idltype="myWChar" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyBoolean" idltype="myBoolean" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyOctet" idltype="myOctet" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMySeqLong" idltype="mySeqLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyString" idltype="myString" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyFixed52" idltype="myFixed52" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyStruct" idltype="myStruct" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyEnum" idltype="myEnum" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyUnion" idltype="myUnion" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyOtherStruct" idltype="myOtherStruct" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyOtherEnum" idltype="myOtherEnum" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyOtherUnion" idltype="myOtherUnion" />
+ </corba:operation>
<wsdl:input name="opInOutRequest">
</wsdl:input>
<wsdl:output name="opInOutResponse">