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 2007/03/02 15:20:10 UTC
svn commit: r513805 [4/4] -
/incubator/yoko/trunk/tools/src/test/resources/idl/
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Struct.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Struct.wsdl?view=diff&rev=513805&r1=513804&r2=513805
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Struct.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Struct.wsdl Fri Mar 2 07:20:09 2007
@@ -20,26 +20,26 @@
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/Struct" xmlns:tns="http://schemas.apache.org/yoko/idl/Struct" xmlns:corba="http://schemas.apache.org/yoko/bindings/corba" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<corba:typeMapping targetNamespace="http://schemas.apache.org/yoko/idl/Struct/typemap">
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct" xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" repositoryID="IDL:OutsideStruct:1.0" name="OutsideStruct" type="ns4:OutsideStruct">
- <corba:member name="number" idltype="corba:long" />
- <corba:member name="word" idltype="corba:string" />
+ <corba:member idltype="corba:long" name="number" />
+ <corba:member idltype="corba:string" name="word" />
</corba:struct>
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct" xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" repositoryID="IDL:StructTest/Employee:1.0" name="StructTest.Employee" type="ns4:StructTest.Employee">
- <corba:member name="name" idltype="corba:string" />
- <corba:member name="dept" idltype="corba:string" />
+ <corba:member idltype="corba:string" name="name" />
+ <corba:member idltype="corba:string" name="dept" />
</corba:struct>
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct" xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" repositoryID="IDL:StructTest/Compensation:1.0" name="StructTest.Compensation" type="ns4:StructTest.Compensation">
- <corba:member name="amount" idltype="corba:long" />
- <corba:member name="currency" idltype="corba:string" />
- <corba:member name="praise" idltype="corba:string" />
+ <corba:member idltype="corba:long" name="amount" />
+ <corba:member idltype="corba:string" name="currency" />
+ <corba:member idltype="corba:string" name="praise" />
</corba:struct>
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct" xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" repositoryID="IDL:StructTest/NestedOutsideStruct:1.0" name="StructTest.NestedOutsideStruct" type="ns4:StructTest.NestedOutsideStruct">
- <corba:member name="aShort" idltype="corba:short" />
- <corba:member name="aLong" idltype="corba:long" />
- <corba:member name="outsider" idltype="OutsideStruct" />
+ <corba:member idltype="corba:short" name="aShort" />
+ <corba:member idltype="corba:long" name="aLong" />
+ <corba:member idltype="OutsideStruct" name="outsider" />
</corba:struct>
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct" xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" repositoryID="IDL:StructTest/NestedStructs:1.0" name="StructTest.NestedStructs" type="ns4:StructTest.NestedStructs">
- <corba:member name="employStruct" idltype="StructTest.Employee" />
- <corba:member name="compensationStruct" idltype="StructTest.Compensation" />
+ <corba:member idltype="StructTest.Employee" name="employStruct" />
+ <corba:member idltype="StructTest.Compensation" name="compensationStruct" />
</corba:struct>
</corba:typeMapping>
<wsdl:types>
@@ -156,8 +156,8 @@
<corba:binding repositoryID="IDL:StructTest:1.0" />
<wsdl:operation name="congratulate">
<corba:operation name="congratulate">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" mode="in" name="emp" idltype="StructTest.Employee" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" mode="out" name="reward" idltype="StructTest.Compensation" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" mode="in" idltype="StructTest.Employee" name="emp" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" mode="out" idltype="StructTest.Compensation" name="reward" />
</corba:operation>
<wsdl:input name="congratulateRequest">
</wsdl:input>
@@ -166,8 +166,8 @@
</wsdl:operation>
<wsdl:operation name="getCompensation">
<corba:operation name="getCompensation">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" mode="in" name="emp2" idltype="StructTest.Employee" />
- <corba:return xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" name="return" idltype="StructTest.Compensation" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" mode="in" idltype="StructTest.Employee" name="emp2" />
+ <corba:return xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" idltype="StructTest.Compensation" name="return" />
</corba:operation>
<wsdl:input name="getCompensationRequest">
</wsdl:input>
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=513805&r1=513804&r2=513805
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Typedef.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Typedef.wsdl Fri Mar 2 07:20:09 2007
@@ -32,15 +32,15 @@
<corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:wchar" repositoryID="IDL:TypedefIf/myWChar:1.0" name="TypedefIf.myWChar" type="xs:string" />
<corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:boolean" repositoryID="IDL:TypedefIf/myBoolean:1.0" name="TypedefIf.myBoolean" type="xs:boolean" />
<corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:octet" repositoryID="IDL:TypedefIf/myOctet:1.0" name="TypedefIf.myOctet" type="xs:unsignedByte" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" elemtype="corba:long" bound="0" repositoryID="IDL:TypedefIf/SeqLong:1.0" name="TypedefIf.SeqLong" type="ns4:TypedefIf.SeqLong" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" bound="0" elemtype="corba:long" repositoryID="IDL:TypedefIf/SeqLong:1.0" name="TypedefIf.SeqLong" type="ns4:TypedefIf.SeqLong" />
<corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:string" repositoryID="IDL:TypedefIf/aString:1.0" name="TypedefIf.aString" type="xs:string" />
<corba:fixed xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" scale="2" digits="5" repositoryID="IDL:TypedefIf/Fixed52:1.0" name="TypedefIf.Fixed52" type="ns4:TypedefIf.Fixed52" />
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.SeqLong" repositoryID="IDL:TypedefIf/mySeqLong:1.0" name="TypedefIf.mySeqLong" type="ns4:TypedefIf.SeqLong" />
<corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:string" repositoryID="IDL:TypedefIf/myString:1.0" name="TypedefIf.myString" type="xs:string" />
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.Fixed52" repositoryID="IDL:TypedefIf/myFixed52:1.0" name="TypedefIf.myFixed52" type="ns4:TypedefIf.Fixed52" />
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" repositoryID="IDL:TypedefIf/aStruct:1.0" name="TypedefIf.aStruct" type="ns4:TypedefIf.aStruct">
- <corba:member name="aStructMyLong" idltype="TypedefIf.myLong" />
- <corba:member name="aLong" idltype="corba:long" />
+ <corba:member idltype="TypedefIf.myLong" name="aStructMyLong" />
+ <corba:member idltype="corba:long" name="aLong" />
</corba:struct>
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.aStruct" repositoryID="IDL:TypedefIf/myStruct:1.0" name="TypedefIf.myStruct" type="ns4:TypedefIf.aStruct" />
<corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" repositoryID="IDL:TypedefIf/aEnum:1.0" name="TypedefIf.aEnum" type="ns4:TypedefIf.aEnum">
@@ -49,18 +49,18 @@
</corba:enum>
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.aEnum" repositoryID="IDL:TypedefIf/myEnum:1.0" name="TypedefIf.myEnum" type="ns4:TypedefIf.aEnum" />
<corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" discriminator="TypedefIf.myEnum" repositoryID="IDL:TypedefIf/aUnion:1.0" name="TypedefIf.aUnion" type="ns4:TypedefIf.aUnion">
- <corba:unionbranch name="aUnionMyLong" idltype="TypedefIf.myLong">
+ <corba:unionbranch idltype="TypedefIf.myLong" name="aUnionMyLong">
<corba:case label="aEnum1" />
</corba:unionbranch>
- <corba:unionbranch name="aUnionLong" idltype="corba:long">
+ <corba:unionbranch idltype="corba:long" name="aUnionLong">
<corba:case label="aEnum2" />
</corba:unionbranch>
- <corba:unionbranch name="aUnionMyBoolean" idltype="TypedefIf.myBoolean" default="true" />
+ <corba:unionbranch default="true" idltype="TypedefIf.myBoolean" name="aUnionMyBoolean" />
</corba:union>
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.aUnion" repositoryID="IDL:TypedefIf/myUnion:1.0" name="TypedefIf.myUnion" type="ns4:TypedefIf.aUnion" />
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" repositoryID="IDL:TypedefIf/anotherStruct:1.0" name="TypedefIf.anotherStruct" type="ns4:TypedefIf.anotherStruct">
- <corba:member name="myOtherLong" idltype="TypedefIf.myLong" />
- <corba:member name="anotherLong" idltype="corba:long" />
+ <corba:member idltype="TypedefIf.myLong" name="myOtherLong" />
+ <corba:member idltype="corba:long" name="anotherLong" />
</corba:struct>
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.anotherStruct" repositoryID="IDL:TypedefIf/myOtherStruct:1.0" name="TypedefIf.myOtherStruct" type="ns4:TypedefIf.anotherStruct" />
<corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" repositoryID="IDL:TypedefIf/anotherEnum:1.0" name="TypedefIf.anotherEnum" type="ns4:TypedefIf.anotherEnum">
@@ -69,13 +69,13 @@
</corba:enum>
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.anotherEnum" repositoryID="IDL:TypedefIf/myOtherEnum:1.0" name="TypedefIf.myOtherEnum" type="ns4:TypedefIf.anotherEnum" />
<corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" discriminator="TypedefIf.myOtherEnum" repositoryID="IDL:TypedefIf/anotherUnion:1.0" name="TypedefIf.anotherUnion" type="ns4:TypedefIf.anotherUnion">
- <corba:unionbranch name="anotherUnionMyLong" idltype="TypedefIf.myLong">
+ <corba:unionbranch idltype="TypedefIf.myLong" name="anotherUnionMyLong">
<corba:case label="anotherEnum1" />
</corba:unionbranch>
- <corba:unionbranch name="anotherUnionLong" idltype="corba:long">
+ <corba:unionbranch idltype="corba:long" name="anotherUnionLong">
<corba:case label="anotherEnum2" />
</corba:unionbranch>
- <corba:unionbranch name="anotherUnionMyBoolean" idltype="TypedefIf.myBoolean" default="true" />
+ <corba:unionbranch default="true" idltype="TypedefIf.myBoolean" name="anotherUnionMyBoolean" />
</corba:union>
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.anotherUnion" repositoryID="IDL:TypedefIf/myOtherUnion:1.0" name="TypedefIf.myOtherUnion" type="ns4:TypedefIf.anotherUnion" />
</corba:typeMapping>
@@ -505,28 +505,28 @@
<corba:binding repositoryID="IDL:TypedefIf:1.0" />
<wsdl:operation name="opIn">
<corba:operation name="opIn">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyFloat" idltype="TypedefIf.myFloat" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyDouble" idltype="TypedefIf.myDouble" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyLongDouble" idltype="TypedefIf.myLongDouble" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyShort" idltype="TypedefIf.myShort" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyLong" idltype="TypedefIf.myLong" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyLongLong" idltype="TypedefIf.myLongLong" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyUnsignedShort" idltype="TypedefIf.myUnsignedShort" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyUnsignedLong" idltype="TypedefIf.myUnsignedLong" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyUnsignedLongLong" idltype="TypedefIf.myUnsignedLongLong" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyChar" idltype="TypedefIf.myChar" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyWChar" idltype="TypedefIf.myWChar" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyBoolean" idltype="TypedefIf.myBoolean" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyOctet" idltype="TypedefIf.myOctet" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMySeqLong" idltype="TypedefIf.mySeqLong" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyString" idltype="TypedefIf.myString" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyFixed52" idltype="TypedefIf.myFixed52" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyStruct" idltype="TypedefIf.myStruct" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyEnum" idltype="TypedefIf.myEnum" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyUnion" idltype="TypedefIf.myUnion" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyOtherStruct" idltype="TypedefIf.myOtherStruct" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyOtherEnum" idltype="TypedefIf.myOtherEnum" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyOtherUnion" idltype="TypedefIf.myOtherUnion" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myFloat" name="inMyFloat" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myDouble" name="inMyDouble" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myLongDouble" name="inMyLongDouble" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myShort" name="inMyShort" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myLong" name="inMyLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myLongLong" name="inMyLongLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myUnsignedShort" name="inMyUnsignedShort" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myUnsignedLong" name="inMyUnsignedLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myUnsignedLongLong" name="inMyUnsignedLongLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myChar" name="inMyChar" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myWChar" name="inMyWChar" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myBoolean" name="inMyBoolean" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myOctet" name="inMyOctet" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.mySeqLong" name="inMySeqLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myString" name="inMyString" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myFixed52" name="inMyFixed52" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myStruct" name="inMyStruct" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myEnum" name="inMyEnum" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myUnion" name="inMyUnion" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myOtherStruct" name="inMyOtherStruct" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myOtherEnum" name="inMyOtherEnum" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" idltype="TypedefIf.myOtherUnion" name="inMyOtherUnion" />
</corba:operation>
<wsdl:input name="opInRequest">
</wsdl:input>
@@ -535,28 +535,28 @@
</wsdl:operation>
<wsdl:operation name="opOut">
<corba:operation name="opOut">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyFloat" idltype="TypedefIf.myFloat" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyDouble" idltype="TypedefIf.myDouble" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyLongDouble" idltype="TypedefIf.myLongDouble" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyShort" idltype="TypedefIf.myShort" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyLong" idltype="TypedefIf.myLong" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyLongLong" idltype="TypedefIf.myLongLong" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyUnsignedShort" idltype="TypedefIf.myUnsignedShort" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyUnsignedLong" idltype="TypedefIf.myUnsignedLong" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyUnsignedLongLong" idltype="TypedefIf.myUnsignedLongLong" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyChar" idltype="TypedefIf.myChar" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyWChar" idltype="TypedefIf.myWChar" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyBoolean" idltype="TypedefIf.myBoolean" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyOctet" idltype="TypedefIf.myOctet" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMySeqLong" idltype="TypedefIf.mySeqLong" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyString" idltype="TypedefIf.myString" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyFixed52" idltype="TypedefIf.myFixed52" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyStruct" idltype="TypedefIf.myStruct" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyEnum" idltype="TypedefIf.myEnum" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyUnion" idltype="TypedefIf.myUnion" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyOtherStruct" idltype="TypedefIf.myOtherStruct" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyOtherEnum" idltype="TypedefIf.myOtherEnum" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyOtherUnion" idltype="TypedefIf.myOtherUnion" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myFloat" name="outMyFloat" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myDouble" name="outMyDouble" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myLongDouble" name="outMyLongDouble" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myShort" name="outMyShort" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myLong" name="outMyLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myLongLong" name="outMyLongLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myUnsignedShort" name="outMyUnsignedShort" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myUnsignedLong" name="outMyUnsignedLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myUnsignedLongLong" name="outMyUnsignedLongLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myChar" name="outMyChar" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myWChar" name="outMyWChar" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myBoolean" name="outMyBoolean" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myOctet" name="outMyOctet" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.mySeqLong" name="outMySeqLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myString" name="outMyString" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myFixed52" name="outMyFixed52" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myStruct" name="outMyStruct" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myEnum" name="outMyEnum" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myUnion" name="outMyUnion" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myOtherStruct" name="outMyOtherStruct" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myOtherEnum" name="outMyOtherEnum" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" idltype="TypedefIf.myOtherUnion" name="outMyOtherUnion" />
</corba:operation>
<wsdl:input name="opOutRequest">
</wsdl:input>
@@ -565,28 +565,28 @@
</wsdl:operation>
<wsdl:operation name="opInOut">
<corba:operation name="opInOut">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyFloat" idltype="TypedefIf.myFloat" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyDouble" idltype="TypedefIf.myDouble" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyLongDouble" idltype="TypedefIf.myLongDouble" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyShort" idltype="TypedefIf.myShort" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyLong" idltype="TypedefIf.myLong" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyLongLong" idltype="TypedefIf.myLongLong" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyUnsignedShort" idltype="TypedefIf.myUnsignedShort" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyUnsignedLong" idltype="TypedefIf.myUnsignedLong" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyUnsignedLongLong" idltype="TypedefIf.myUnsignedLongLong" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyChar" idltype="TypedefIf.myChar" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyWChar" idltype="TypedefIf.myWChar" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyBoolean" idltype="TypedefIf.myBoolean" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyOctet" idltype="TypedefIf.myOctet" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMySeqLong" idltype="TypedefIf.mySeqLong" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyString" idltype="TypedefIf.myString" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyFixed52" idltype="TypedefIf.myFixed52" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyStruct" idltype="TypedefIf.myStruct" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyEnum" idltype="TypedefIf.myEnum" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyUnion" idltype="TypedefIf.myUnion" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyOtherStruct" idltype="TypedefIf.myOtherStruct" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyOtherEnum" idltype="TypedefIf.myOtherEnum" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyOtherUnion" idltype="TypedefIf.myOtherUnion" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myFloat" name="inoutMyFloat" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myDouble" name="inoutMyDouble" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myLongDouble" name="inoutMyLongDouble" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myShort" name="inoutMyShort" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myLong" name="inoutMyLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myLongLong" name="inoutMyLongLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myUnsignedShort" name="inoutMyUnsignedShort" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myUnsignedLong" name="inoutMyUnsignedLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myUnsignedLongLong" name="inoutMyUnsignedLongLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myChar" name="inoutMyChar" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myWChar" name="inoutMyWChar" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myBoolean" name="inoutMyBoolean" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myOctet" name="inoutMyOctet" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.mySeqLong" name="inoutMySeqLong" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myString" name="inoutMyString" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myFixed52" name="inoutMyFixed52" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myStruct" name="inoutMyStruct" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myEnum" name="inoutMyEnum" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myUnion" name="inoutMyUnion" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myOtherStruct" name="inoutMyOtherStruct" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myOtherEnum" name="inoutMyOtherEnum" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" idltype="TypedefIf.myOtherUnion" name="inoutMyOtherUnion" />
</corba:operation>
<wsdl:input name="opInOutRequest">
</wsdl:input>
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Union.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Union.wsdl?view=diff&rev=513805&r1=513804&r2=513805
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Union.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Union.wsdl Fri Mar 2 07:20:09 2007
@@ -26,20 +26,20 @@
<corba:enumerator value="e1_4" />
</corba:enum>
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" repositoryID="IDL:s1:1.0" name="s1" type="ns4:s1">
- <corba:member name="s1_1" idltype="corba:short" />
- <corba:member name="s1_2" idltype="corba:short" />
- <corba:member name="s1_3" idltype="corba:short" />
+ <corba:member idltype="corba:short" name="s1_1" />
+ <corba:member idltype="corba:short" name="s1_2" />
+ <corba:member idltype="corba:short" name="s1_3" />
</corba:struct>
<corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" discriminator="e1" repositoryID="IDL:u1:1.0" name="u1" type="ns4:u1">
- <corba:unionbranch name="u1_1" idltype="corba:long">
+ <corba:unionbranch idltype="corba:long" name="u1_1">
<corba:case label="e1_1" />
</corba:unionbranch>
- <corba:unionbranch name="u1_2" idltype="corba:string">
+ <corba:unionbranch idltype="corba:string" name="u1_2">
<corba:case label="e1_3" />
<corba:case label="e1_2" />
<corba:case label="e1_2" />
</corba:unionbranch>
- <corba:unionbranch name="u1_3" idltype="s1" default="true" />
+ <corba:unionbranch default="true" idltype="s1" name="u1_3" />
</corba:union>
<corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" repositoryID="IDL:if/e2:1.0" name="if.e2" type="ns4:if.e2">
<corba:enumerator value="e2_1" />
@@ -48,20 +48,20 @@
<corba:enumerator value="e2_4" />
</corba:enum>
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" repositoryID="IDL:if/s2:1.0" name="if.s2" type="ns4:if.s2">
- <corba:member name="s2_1" idltype="corba:short" />
- <corba:member name="s2_2" idltype="corba:short" />
- <corba:member name="s2_3" idltype="corba:short" />
+ <corba:member idltype="corba:short" name="s2_1" />
+ <corba:member idltype="corba:short" name="s2_2" />
+ <corba:member idltype="corba:short" name="s2_3" />
</corba:struct>
<corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" discriminator="if.e2" repositoryID="IDL:if/u2:1.0" name="if.u2" type="ns4:if.u2">
- <corba:unionbranch name="u2_1" idltype="corba:long">
+ <corba:unionbranch idltype="corba:long" name="u2_1">
<corba:case label="e2_1" />
</corba:unionbranch>
- <corba:unionbranch name="u2_2" idltype="corba:string">
+ <corba:unionbranch idltype="corba:string" name="u2_2">
<corba:case label="e2_3" />
<corba:case label="e2_2" />
<corba:case label="e2_2" />
</corba:unionbranch>
- <corba:unionbranch name="u2_3" idltype="if.s2" default="true" />
+ <corba:unionbranch default="true" idltype="if.s2" name="u2_3" />
</corba:union>
<corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" repositoryID="IDL:m/e3:1.0" name="m.e3" type="ns4:m.e3">
<corba:enumerator value="e3_1" />
@@ -70,20 +70,20 @@
<corba:enumerator value="e3_4" />
</corba:enum>
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" repositoryID="IDL:m/s3:1.0" name="m.s3" type="ns4:m.s3">
- <corba:member name="s3_1" idltype="corba:short" />
- <corba:member name="s3_2" idltype="corba:short" />
- <corba:member name="s3_3" idltype="corba:short" />
+ <corba:member idltype="corba:short" name="s3_1" />
+ <corba:member idltype="corba:short" name="s3_2" />
+ <corba:member idltype="corba:short" name="s3_3" />
</corba:struct>
<corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" discriminator="m.e3" repositoryID="IDL:m/u3:1.0" name="m.u3" type="ns4:m.u3">
- <corba:unionbranch name="u3_1" idltype="corba:long">
+ <corba:unionbranch idltype="corba:long" name="u3_1">
<corba:case label="e3_1" />
</corba:unionbranch>
- <corba:unionbranch name="u3_2" idltype="corba:string">
+ <corba:unionbranch idltype="corba:string" name="u3_2">
<corba:case label="e3_3" />
<corba:case label="e3_2" />
<corba:case label="e3_2" />
</corba:unionbranch>
- <corba:unionbranch name="u3_3" idltype="m.s3" default="true" />
+ <corba:unionbranch default="true" idltype="m.s3" name="u3_3" />
</corba:union>
</corba:typeMapping>
<wsdl:types>