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 [3/4] -
/incubator/yoko/trunk/tools/src/test/resources/idl/
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Declarators.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Declarators.wsdl?view=diff&rev=513805&r1=513804&r2=513805
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Declarators.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Declarators.wsdl Fri Mar 2 07:20:09 2007
@@ -47,12 +47,12 @@
<corba:array xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" bound="10" repositoryID="IDL:array_long:1.0" name="array_long" type="simple_long" />
<corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:long" repositoryID="IDL:mixed_long_module/simple_long:1.0" name="mixed_long_module.simple_long" type="xs:int" />
<corba:array xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" bound="10" repositoryID="IDL:mixed_long_module/array_long:1.0" name="mixed_long_module.array_long" type="mixed_long_module.simple_long" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" elemtype="corba:ulonglong" bound="0" repositoryID="IDL:unboundedSeqUnsignedLongLong1:1.0" name="unboundedSeqUnsignedLongLong1" type="ns4:unboundedSeqUnsignedLongLong1" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" elemtype="corba:ulonglong" bound="0" repositoryID="IDL:unboundedSeqUnsignedLongLong2:1.0" name="unboundedSeqUnsignedLongLong2" type="ns4:unboundedSeqUnsignedLongLong2" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" elemtype="corba:ulonglong" bound="0" repositoryID="IDL:unboundedSeqUnsignedLongLong3:1.0" name="unboundedSeqUnsignedLongLong3" type="ns4:unboundedSeqUnsignedLongLong3" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" elemtype="corba:ulonglong" bound="0" repositoryID="IDL:sequence_module/unboundedSeqUnsignedLongLong1:1.0" name="sequence_module.unboundedSeqUnsignedLongLong1" type="ns4:sequence_module.unboundedSeqUnsignedLongLong1" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" elemtype="corba:ulonglong" bound="0" repositoryID="IDL:sequence_module/unboundedSeqUnsignedLongLong2:1.0" name="sequence_module.unboundedSeqUnsignedLongLong2" type="ns4:sequence_module.unboundedSeqUnsignedLongLong2" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" elemtype="corba:ulonglong" bound="0" repositoryID="IDL:sequence_module/unboundedSeqUnsignedLongLong3:1.0" name="sequence_module.unboundedSeqUnsignedLongLong3" type="ns4:sequence_module.unboundedSeqUnsignedLongLong3" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" bound="0" elemtype="corba:ulonglong" repositoryID="IDL:unboundedSeqUnsignedLongLong1:1.0" name="unboundedSeqUnsignedLongLong1" type="ns4:unboundedSeqUnsignedLongLong1" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" bound="0" elemtype="corba:ulonglong" repositoryID="IDL:unboundedSeqUnsignedLongLong2:1.0" name="unboundedSeqUnsignedLongLong2" type="ns4:unboundedSeqUnsignedLongLong2" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" bound="0" elemtype="corba:ulonglong" repositoryID="IDL:unboundedSeqUnsignedLongLong3:1.0" name="unboundedSeqUnsignedLongLong3" type="ns4:unboundedSeqUnsignedLongLong3" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" bound="0" elemtype="corba:ulonglong" repositoryID="IDL:sequence_module/unboundedSeqUnsignedLongLong1:1.0" name="sequence_module.unboundedSeqUnsignedLongLong1" type="ns4:sequence_module.unboundedSeqUnsignedLongLong1" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" bound="0" elemtype="corba:ulonglong" repositoryID="IDL:sequence_module/unboundedSeqUnsignedLongLong2:1.0" name="sequence_module.unboundedSeqUnsignedLongLong2" type="ns4:sequence_module.unboundedSeqUnsignedLongLong2" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" bound="0" elemtype="corba:ulonglong" repositoryID="IDL:sequence_module/unboundedSeqUnsignedLongLong3:1.0" name="sequence_module.unboundedSeqUnsignedLongLong3" type="ns4:sequence_module.unboundedSeqUnsignedLongLong3" />
<corba:fixed xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" scale="2" digits="31" repositoryID="IDL:f1:1.0" name="f1" type="ns4:f1" />
<corba:fixed xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" scale="2" digits="31" repositoryID="IDL:f2:1.0" name="f2" type="ns4:f1" />
<corba:fixed xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" scale="2" digits="31" repositoryID="IDL:f3:1.0" name="f3" type="ns4:f1" />
@@ -72,26 +72,26 @@
<corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:wstring" repositoryID="IDL:string_module/wstring2:1.0" name="string_module.wstring2" type="xs:string" />
<corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:wstring" repositoryID="IDL:string_module/wstring3:1.0" name="string_module.wstring3" type="xs:string" />
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" repositoryID="IDL:testStruct:1.0" name="testStruct" type="ns4:testStruct">
- <corba:member name="aLong" idltype="corba:long" />
- <corba:member name="aString" idltype="corba:string" />
+ <corba:member idltype="corba:long" name="aLong" />
+ <corba:member idltype="corba:string" name="aString" />
</corba:struct>
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="testStruct" repositoryID="IDL:struct1:1.0" name="struct1" type="ns4:testStruct" />
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="testStruct" repositoryID="IDL:struct2:1.0" name="struct2" type="ns4:testStruct" />
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" repositoryID="IDL:struct_module/testStruct:1.0" name="struct_module.testStruct" type="ns4:struct_module.testStruct">
- <corba:member name="aLong" idltype="corba:long" />
- <corba:member name="aString" idltype="corba:string" />
+ <corba:member idltype="corba:long" name="aLong" />
+ <corba:member idltype="corba:string" name="aString" />
</corba:struct>
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="struct_module.testStruct" repositoryID="IDL:struct_module/struct1:1.0" name="struct_module.struct1" type="ns4:struct_module.testStruct" />
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="struct_module.testStruct" repositoryID="IDL:struct_module/struct2:1.0" name="struct_module.struct2" type="ns4:struct_module.testStruct" />
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" repositoryID="IDL:typedefStruct:1.0" name="typedefStruct" type="ns4:typedefStruct">
- <corba:member name="ulonglong" idltype="corba:ulonglong" />
- <corba:member name="ushort" idltype="corba:ushort" />
+ <corba:member idltype="corba:ulonglong" name="ulonglong" />
+ <corba:member idltype="corba:ushort" name="ushort" />
</corba:struct>
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefStruct" repositoryID="IDL:typedefStruct1:1.0" name="typedefStruct1" type="ns4:typedefStruct" />
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefStruct" repositoryID="IDL:typedefStruct2:1.0" name="typedefStruct2" type="ns4:typedefStruct" />
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" repositoryID="IDL:typedefStruct_module/typedefStruct:1.0" name="typedefStruct_module.typedefStruct" type="ns4:typedefStruct_module.typedefStruct">
- <corba:member name="ulonglong" idltype="corba:ulonglong" />
- <corba:member name="ushort" idltype="corba:ushort" />
+ <corba:member idltype="corba:ulonglong" name="ulonglong" />
+ <corba:member idltype="corba:ushort" name="ushort" />
</corba:struct>
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefStruct_module.typedefStruct" repositoryID="IDL:typedefStruct_module/typedefStruct1:1.0" name="typedefStruct_module.typedefStruct1" type="ns4:typedefStruct_module.typedefStruct" />
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefStruct_module.typedefStruct" repositoryID="IDL:typedefStruct_module/typedefStruct2:1.0" name="typedefStruct_module.typedefStruct2" type="ns4:typedefStruct_module.typedefStruct" />
@@ -102,20 +102,20 @@
<corba:enumerator value="e1_4" />
</corba:enum>
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" repositoryID="IDL:aStruct:1.0" name="aStruct" type="ns4:aStruct">
- <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/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" discriminator="aEnum" repositoryID="IDL:aUnion:1.0" name="aUnion" type="ns4:aUnion">
- <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="aStruct" default="true" />
+ <corba:unionbranch default="true" idltype="aStruct" name="u1_3" />
</corba:union>
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="aUnion" repositoryID="IDL:union1:1.0" name="union1" type="ns4:aUnion" />
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="aUnion" repositoryID="IDL:union2:1.0" name="union2" type="ns4:aUnion" />
@@ -127,48 +127,48 @@
<corba:enumerator value="e1_4" />
</corba:enum>
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" repositoryID="IDL:union_module/aStruct:1.0" name="union_module.aStruct" type="ns4:union_module.aStruct">
- <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/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" discriminator="union_module.aEnum" repositoryID="IDL:union_module/aUnion:1.0" name="union_module.aUnion" type="ns4:union_module.aUnion">
- <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="union_module.aStruct" default="true" />
+ <corba:unionbranch default="true" idltype="union_module.aStruct" name="u1_3" />
</corba:union>
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="union_module.aUnion" repositoryID="IDL:union_module/union1:1.0" name="union_module.union1" type="ns4:union_module.aUnion" />
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="union_module.aUnion" repositoryID="IDL:union_module/union2:1.0" name="union_module.union2" type="ns4:union_module.aUnion" />
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="union_module.aUnion" repositoryID="IDL:union_module/union3:1.0" name="union_module.union3" type="ns4:union_module.aUnion" />
<corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" discriminator="aEnum" repositoryID="IDL:typedefUnion:1.0" name="typedefUnion" type="ns4:typedefUnion">
- <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="aStruct" default="true" />
+ <corba:unionbranch default="true" idltype="aStruct" name="u1_3" />
</corba:union>
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefUnion" repositoryID="IDL:typedefUnion1:1.0" name="typedefUnion1" type="ns4:typedefUnion" />
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefUnion" repositoryID="IDL:typedefUnion2:1.0" name="typedefUnion2" type="ns4:typedefUnion" />
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefUnion" repositoryID="IDL:typedefUnion3:1.0" name="typedefUnion3" type="ns4:typedefUnion" />
<corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" discriminator="aEnum" repositoryID="IDL:typedefUnion_module/typedefUnion:1.0" name="typedefUnion_module.typedefUnion" type="ns4:typedefUnion_module.typedefUnion">
- <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="aStruct" default="true" />
+ <corba:unionbranch default="true" idltype="aStruct" name="u1_3" />
</corba:union>
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefUnion_module.typedefUnion" repositoryID="IDL:typedefUnion_module/typedefUnion1:1.0" name="typedefUnion_module.typedefUnion1" type="ns4:typedefUnion_module.typedefUnion" />
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefUnion_module.typedefUnion" repositoryID="IDL:typedefUnion_module/typedefUnion2:1.0" name="typedefUnion_module.typedefUnion2" type="ns4:typedefUnion_module.typedefUnion" />
@@ -977,7 +977,7 @@
<corba:binding repositoryID="IDL:multiple_attributes:1.0" />
<wsdl:operation name="_get_ull1">
<corba:operation name="_get_ull1">
- <corba:return name="return" idltype="corba:ulonglong" />
+ <corba:return idltype="corba:ulonglong" name="return" />
</corba:operation>
<wsdl:input name="_get_ull1">
</wsdl:input>
@@ -986,7 +986,7 @@
</wsdl:operation>
<wsdl:operation name="_get_ull2">
<corba:operation name="_get_ull2">
- <corba:return name="return" idltype="corba:ulonglong" />
+ <corba:return idltype="corba:ulonglong" name="return" />
</corba:operation>
<wsdl:input name="_get_ull2">
</wsdl:input>
@@ -995,7 +995,7 @@
</wsdl:operation>
<wsdl:operation name="_get_ull3">
<corba:operation name="_get_ull3">
- <corba:return name="return" idltype="corba:ulonglong" />
+ <corba:return idltype="corba:ulonglong" name="return" />
</corba:operation>
<wsdl:input name="_get_ull3">
</wsdl:input>
@@ -1004,7 +1004,7 @@
</wsdl:operation>
<wsdl:operation name="_get_short1">
<corba:operation name="_get_short1">
- <corba:return name="return" idltype="corba:ushort" />
+ <corba:return idltype="corba:ushort" name="return" />
</corba:operation>
<wsdl:input name="_get_short1">
</wsdl:input>
@@ -1013,7 +1013,7 @@
</wsdl:operation>
<wsdl:operation name="_set_short1">
<corba:operation name="_set_short1">
- <corba:param mode="in" name="_arg" idltype="corba:ushort" />
+ <corba:param mode="in" idltype="corba:ushort" name="_arg" />
</corba:operation>
<wsdl:input name="_set_short1">
</wsdl:input>
@@ -1022,7 +1022,7 @@
</wsdl:operation>
<wsdl:operation name="_get_short2">
<corba:operation name="_get_short2">
- <corba:return name="return" idltype="corba:ushort" />
+ <corba:return idltype="corba:ushort" name="return" />
</corba:operation>
<wsdl:input name="_get_short2">
</wsdl:input>
@@ -1031,7 +1031,7 @@
</wsdl:operation>
<wsdl:operation name="_set_short2">
<corba:operation name="_set_short2">
- <corba:param mode="in" name="_arg" idltype="corba:ushort" />
+ <corba:param mode="in" idltype="corba:ushort" name="_arg" />
</corba:operation>
<wsdl:input name="_set_short2">
</wsdl:input>
@@ -1040,7 +1040,7 @@
</wsdl:operation>
<wsdl:operation name="_get_short3">
<corba:operation name="_get_short3">
- <corba:return name="return" idltype="corba:ushort" />
+ <corba:return idltype="corba:ushort" name="return" />
</corba:operation>
<wsdl:input name="_get_short3">
</wsdl:input>
@@ -1049,7 +1049,7 @@
</wsdl:operation>
<wsdl:operation name="_set_short3">
<corba:operation name="_set_short3">
- <corba:param mode="in" name="_arg" idltype="corba:ushort" />
+ <corba:param mode="in" idltype="corba:ushort" name="_arg" />
</corba:operation>
<wsdl:input name="_set_short3">
</wsdl:input>
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Enum.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Enum.wsdl?view=diff&rev=513805&r1=513804&r2=513805
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Enum.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Enum.wsdl Fri Mar 2 07:20:09 2007
@@ -322,7 +322,7 @@
<corba:binding repositoryID="IDL:m1/if3:1.0" />
<wsdl:operation name="if3_op1">
<corba:operation name="if3_op1">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="in" name="in_e_type3" idltype="m1.e_type3" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="in" idltype="m1.e_type3" name="in_e_type3" />
</corba:operation>
<wsdl:input name="if3_op1Request">
</wsdl:input>
@@ -331,7 +331,7 @@
</wsdl:operation>
<wsdl:operation name="if3_op2">
<corba:operation name="if3_op2">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="in" name="in_e_type4" idltype="m1.if3.e_type4" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="in" idltype="m1.if3.e_type4" name="in_e_type4" />
</corba:operation>
<wsdl:input name="if3_op2Request">
</wsdl:input>
@@ -343,7 +343,7 @@
<corba:binding repositoryID="IDL:if1:1.0" />
<wsdl:operation name="if1_op1">
<corba:operation name="if1_op1">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="in" name="in_e_type2" idltype="if1.e_type2" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="in" idltype="if1.e_type2" name="in_e_type2" />
</corba:operation>
<wsdl:input name="if1_op1Request">
</wsdl:input>
@@ -352,7 +352,7 @@
</wsdl:operation>
<wsdl:operation name="if1_op2">
<corba:operation name="if1_op2">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="out" name="out_e_type2" idltype="if1.e_type2" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="out" idltype="if1.e_type2" name="out_e_type2" />
</corba:operation>
<wsdl:input name="if1_op2Request">
</wsdl:input>
@@ -361,7 +361,7 @@
</wsdl:operation>
<wsdl:operation name="if1_op3">
<corba:operation name="if1_op3">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="inout" name="inout_e_type2" idltype="if1.e_type2" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="inout" idltype="if1.e_type2" name="inout_e_type2" />
</corba:operation>
<wsdl:input name="if1_op3Request">
</wsdl:input>
@@ -373,7 +373,7 @@
<corba:binding repositoryID="IDL:if2:1.0" />
<wsdl:operation name="if2_op1">
<corba:operation name="if2_op1">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="in" name="in_e_type1" idltype="e_type1" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="in" idltype="e_type1" name="in_e_type1" />
</corba:operation>
<wsdl:input name="if2_op1Request">
</wsdl:input>
@@ -382,7 +382,7 @@
</wsdl:operation>
<wsdl:operation name="if2_op2">
<corba:operation name="if2_op2">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="out" name="out_e_type1" idltype="e_type1" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="out" idltype="e_type1" name="out_e_type1" />
</corba:operation>
<wsdl:input name="if2_op2Request">
</wsdl:input>
@@ -391,7 +391,7 @@
</wsdl:operation>
<wsdl:operation name="if2_op3">
<corba:operation name="if2_op3">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="inout" name="inout_e_type1" idltype="e_type1" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" mode="inout" idltype="e_type1" name="inout_e_type1" />
</corba:operation>
<wsdl:input name="if2_op3Request">
</wsdl:input>
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Exception.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Exception.wsdl?view=diff&rev=513805&r1=513804&r2=513805
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Exception.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Exception.wsdl Fri Mar 2 07:20:09 2007
@@ -20,12 +20,12 @@
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/Exception" xmlns:tns="http://schemas.apache.org/yoko/idl/Exception" 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/Exception/typemap">
<corba:exception xmlns:ns4="http://schemas.apache.org/yoko/idl/Exception" xmlns="http://schemas.apache.org/yoko/idl/Exception/typemap" repositoryID="IDL:ExternalException:1.0" name="ExternalException" type="ns4:ExternalExceptionType">
- <corba:member name="description" idltype="corba:string" />
+ <corba:member idltype="corba:string" name="description" />
</corba:exception>
<corba:exception xmlns:ns4="http://schemas.apache.org/yoko/idl/Exception" xmlns="http://schemas.apache.org/yoko/idl/Exception/typemap" repositoryID="IDL:InterfaceWithExceptions/EmptyException:1.0" name="InterfaceWithExceptions.EmptyException" type="ns4:InterfaceWithExceptions.EmptyExceptionType" />
<corba:exception xmlns:ns4="http://schemas.apache.org/yoko/idl/Exception" xmlns="http://schemas.apache.org/yoko/idl/Exception/typemap" repositoryID="IDL:InterfaceWithExceptions/LongException:1.0" name="InterfaceWithExceptions.LongException" type="ns4:InterfaceWithExceptions.LongExceptionType">
- <corba:member name="error" idltype="corba:string" />
- <corba:member name="code" idltype="corba:long" />
+ <corba:member idltype="corba:string" name="error" />
+ <corba:member idltype="corba:long" name="code" />
</corba:exception>
</corba:typeMapping>
<wsdl:types>
@@ -144,10 +144,10 @@
<corba:binding repositoryID="IDL:InterfaceWithExceptions:1.0" />
<wsdl:operation name="method">
<corba:operation name="method">
- <corba:param mode="in" name="in_string" idltype="corba:string" />
- <corba:param mode="out" name="out_long" idltype="corba:long" />
- <corba:param mode="inout" name="inout_short" idltype="corba:short" />
- <corba:return name="return" idltype="corba:string" />
+ <corba:param mode="in" idltype="corba:string" name="in_string" />
+ <corba:param mode="out" idltype="corba:long" name="out_long" />
+ <corba:param mode="inout" idltype="corba:short" name="inout_short" />
+ <corba:return idltype="corba:string" name="return" />
<corba:raises xmlns="http://schemas.apache.org/yoko/idl/Exception/typemap" exception="LongException" />
<corba:raises xmlns="http://schemas.apache.org/yoko/idl/Exception/typemap" exception="EmptyException" />
</corba:operation>
@@ -162,7 +162,7 @@
</wsdl:operation>
<wsdl:operation name="raiseExternalException">
<corba:operation name="raiseExternalException">
- <corba:param mode="in" name="aString" idltype="corba:string" />
+ <corba:param mode="in" idltype="corba:string" name="aString" />
<corba:raises xmlns="http://schemas.apache.org/yoko/idl/Exception/typemap" exception="ExternalException" />
</corba:operation>
<wsdl:input name="raiseExternalExceptionRequest">
@@ -178,4 +178,4 @@
<corba:address location="IOR:" />
</wsdl:port>
</wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Fixed.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Fixed.wsdl?view=diff&rev=513805&r1=513804&r2=513805
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Fixed.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Fixed.wsdl Fri Mar 2 07:20:09 2007
@@ -246,7 +246,7 @@
<corba:binding repositoryID="IDL:m/m_if:1.0" />
<wsdl:operation name="op4_1">
<corba:operation name="op4_1">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Fixed/typemap" mode="in" name="in_m_if_op4_1_f1_1" idltype="f1_1" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Fixed/typemap" mode="in" idltype="f1_1" name="in_m_if_op4_1_f1_1" />
</corba:operation>
<wsdl:input name="op4_1Request">
</wsdl:input>
@@ -255,7 +255,7 @@
</wsdl:operation>
<wsdl:operation name="op4_3">
<corba:operation name="op4_3">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Fixed/typemap" mode="inout" name="inout_m_if_op4_3_f3_1" idltype="m.f3_1" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Fixed/typemap" mode="inout" idltype="m.f3_1" name="inout_m_if_op4_3_f3_1" />
</corba:operation>
<wsdl:input name="op4_3Request">
</wsdl:input>
@@ -264,7 +264,7 @@
</wsdl:operation>
<wsdl:operation name="op4_4">
<corba:operation name="op4_4">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Fixed/typemap" mode="in" name="in_m_if_op4_4_f4_1" idltype="m.m_if.f4_1" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Fixed/typemap" mode="in" idltype="m.m_if.f4_1" name="in_m_if_op4_4_f4_1" />
</corba:operation>
<wsdl:input name="op4_4Request">
</wsdl:input>
@@ -276,7 +276,7 @@
<corba:binding repositoryID="IDL:if:1.0" />
<wsdl:operation name="op2_1">
<corba:operation name="op2_1">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Fixed/typemap" mode="in" name="in_op2_1_f1_1" idltype="f1_1" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Fixed/typemap" mode="in" idltype="f1_1" name="in_op2_1_f1_1" />
</corba:operation>
<wsdl:input name="op2_1Request">
</wsdl:input>
@@ -285,7 +285,7 @@
</wsdl:operation>
<wsdl:operation name="op2_2">
<corba:operation name="op2_2">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/Fixed/typemap" mode="out" name="out_op2_2_f2_2" idltype="if.f2_2" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/Fixed/typemap" mode="out" idltype="if.f2_2" name="out_op2_2_f2_2" />
</corba:operation>
<wsdl:input name="op2_2Request">
</wsdl:input>
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_HelloWorld.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_HelloWorld.wsdl?view=diff&rev=513805&r1=513804&r2=513805
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_HelloWorld.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_HelloWorld.wsdl Fri Mar 2 07:20:09 2007
@@ -59,8 +59,8 @@
<corba:binding repositoryID="IDL:HelloWorld:1.0" />
<wsdl:operation name="greetMe">
<corba:operation name="greetMe">
- <corba:param mode="in" name="return_message" idltype="corba:string" />
- <corba:return name="return" idltype="corba:string" />
+ <corba:param mode="in" idltype="corba:string" name="return_message" />
+ <corba:return idltype="corba:string" name="return" />
</corba:operation>
<wsdl:input name="greetMeRequest">
</wsdl:input>
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Oneway.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Oneway.wsdl?view=diff&rev=513805&r1=513804&r2=513805
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Oneway.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Oneway.wsdl Fri Mar 2 07:20:09 2007
@@ -288,22 +288,22 @@
</wsdl:operation>
<wsdl:operation name="onewayInOperation">
<corba:operation name="onewayInOperation">
- <corba:param mode="in" name="inString" idltype="corba:string" />
+ <corba:param mode="in" idltype="corba:string" name="inString" />
</corba:operation>
<wsdl:input name="onewayInOperationRequest">
</wsdl:input>
</wsdl:operation>
<wsdl:operation name="onewayInInOperation">
<corba:operation name="onewayInInOperation">
- <corba:param mode="in" name="inString1" idltype="corba:string" />
- <corba:param mode="in" name="inString2" idltype="corba:string" />
+ <corba:param mode="in" idltype="corba:string" name="inString1" />
+ <corba:param mode="in" idltype="corba:string" name="inString2" />
</corba:operation>
<wsdl:input name="onewayInInOperationRequest">
</wsdl:input>
</wsdl:operation>
<wsdl:operation name="voidInOperation">
<corba:operation name="voidInOperation">
- <corba:param mode="in" name="inLong" idltype="corba:long" />
+ <corba:param mode="in" idltype="corba:long" name="inLong" />
</corba:operation>
<wsdl:input name="voidInOperationRequest">
</wsdl:input>
@@ -312,7 +312,7 @@
</wsdl:operation>
<wsdl:operation name="voidOutOperation">
<corba:operation name="voidOutOperation">
- <corba:param mode="out" name="outLong" idltype="corba:long" />
+ <corba:param mode="out" idltype="corba:long" name="outLong" />
</corba:operation>
<wsdl:input name="voidOutOperationRequest">
</wsdl:input>
@@ -321,7 +321,7 @@
</wsdl:operation>
<wsdl:operation name="voidInOutOperation">
<corba:operation name="voidInOutOperation">
- <corba:param mode="inout" name="inOutLong" idltype="corba:long" />
+ <corba:param mode="inout" idltype="corba:long" name="inOutLong" />
</corba:operation>
<wsdl:input name="voidInOutOperationRequest">
</wsdl:input>
@@ -330,8 +330,8 @@
</wsdl:operation>
<wsdl:operation name="shortInOperation">
<corba:operation name="shortInOperation">
- <corba:param mode="in" name="inShort" idltype="corba:short" />
- <corba:return name="return" idltype="corba:short" />
+ <corba:param mode="in" idltype="corba:short" name="inShort" />
+ <corba:return idltype="corba:short" name="return" />
</corba:operation>
<wsdl:input name="shortInOperationRequest">
</wsdl:input>
@@ -340,8 +340,8 @@
</wsdl:operation>
<wsdl:operation name="shortOutOperation">
<corba:operation name="shortOutOperation">
- <corba:param mode="out" name="outShort" idltype="corba:short" />
- <corba:return name="return" idltype="corba:short" />
+ <corba:param mode="out" idltype="corba:short" name="outShort" />
+ <corba:return idltype="corba:short" name="return" />
</corba:operation>
<wsdl:input name="shortOutOperationRequest">
</wsdl:input>
@@ -350,8 +350,8 @@
</wsdl:operation>
<wsdl:operation name="shortInOutOperation">
<corba:operation name="shortInOutOperation">
- <corba:param mode="inout" name="inOutShort" idltype="corba:short" />
- <corba:return name="return" idltype="corba:short" />
+ <corba:param mode="inout" idltype="corba:short" name="inOutShort" />
+ <corba:return idltype="corba:short" name="return" />
</corba:operation>
<wsdl:input name="shortInOutOperationRequest">
</wsdl:input>
@@ -360,7 +360,7 @@
</wsdl:operation>
<wsdl:operation name="shortOperation">
<corba:operation name="shortOperation">
- <corba:return name="return" idltype="corba:short" />
+ <corba:return idltype="corba:short" name="return" />
</corba:operation>
<wsdl:input name="shortOperationRequest">
</wsdl:input>
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Primitives.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Primitives.wsdl?view=diff&rev=513805&r1=513804&r2=513805
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Primitives.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Primitives.wsdl Fri Mar 2 07:20:09 2007
@@ -19,7 +19,7 @@
-->
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/primitives" xmlns:tns="http://schemas.apache.org/yoko/idl/primitives" 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/primitives/typemap">
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/primitives" xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" elemtype="corba:string" bound="0" repositoryID="IDL:stringArray:1.0" name="stringArray" type="ns4:stringArray" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/primitives" xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" bound="0" elemtype="corba:string" repositoryID="IDL:stringArray:1.0" name="stringArray" type="ns4:stringArray" />
</corba:typeMapping>
<wsdl:types>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/primitives" xmlns="http://schemas.apache.org/yoko/idl/primitives" xmlns:xs="http://www.w3.org/2001/XMLSchema">
@@ -1945,7 +1945,7 @@
<corba:binding repositoryID="IDL:Primitives:1.0" />
<wsdl:operation name="getShort">
<corba:operation name="getShort">
- <corba:param mode="out" name="outShort" idltype="corba:short" />
+ <corba:param mode="out" idltype="corba:short" name="outShort" />
</corba:operation>
<wsdl:input name="getShortRequest">
</wsdl:input>
@@ -1954,7 +1954,7 @@
</wsdl:operation>
<wsdl:operation name="setShort">
<corba:operation name="setShort">
- <corba:param mode="in" name="inShort" idltype="corba:short" />
+ <corba:param mode="in" idltype="corba:short" name="inShort" />
</corba:operation>
<wsdl:input name="setShortRequest">
</wsdl:input>
@@ -1963,7 +1963,7 @@
</wsdl:operation>
<wsdl:operation name="getSetShort">
<corba:operation name="getSetShort">
- <corba:param mode="inout" name="inOutShort" idltype="corba:short" />
+ <corba:param mode="inout" idltype="corba:short" name="inOutShort" />
</corba:operation>
<wsdl:input name="getSetShortRequest">
</wsdl:input>
@@ -1972,10 +1972,10 @@
</wsdl:operation>
<wsdl:operation name="testShort">
<corba:operation name="testShort">
- <corba:param mode="in" name="inShort" idltype="corba:short" />
- <corba:param mode="inout" name="inoutShort" idltype="corba:short" />
- <corba:param mode="out" name="outShort" idltype="corba:short" />
- <corba:return name="return" idltype="corba:short" />
+ <corba:param mode="in" idltype="corba:short" name="inShort" />
+ <corba:param mode="inout" idltype="corba:short" name="inoutShort" />
+ <corba:param mode="out" idltype="corba:short" name="outShort" />
+ <corba:return idltype="corba:short" name="return" />
</corba:operation>
<wsdl:input name="testShortRequest">
</wsdl:input>
@@ -1984,7 +1984,7 @@
</wsdl:operation>
<wsdl:operation name="getUnsignedShort">
<corba:operation name="getUnsignedShort">
- <corba:param mode="out" name="outUnsignedShort" idltype="corba:ushort" />
+ <corba:param mode="out" idltype="corba:ushort" name="outUnsignedShort" />
</corba:operation>
<wsdl:input name="getUnsignedShortRequest">
</wsdl:input>
@@ -1993,7 +1993,7 @@
</wsdl:operation>
<wsdl:operation name="setUnsignedShort">
<corba:operation name="setUnsignedShort">
- <corba:param mode="in" name="inUnsignedShort" idltype="corba:ushort" />
+ <corba:param mode="in" idltype="corba:ushort" name="inUnsignedShort" />
</corba:operation>
<wsdl:input name="setUnsignedShortRequest">
</wsdl:input>
@@ -2002,7 +2002,7 @@
</wsdl:operation>
<wsdl:operation name="getSetUnsignedShort">
<corba:operation name="getSetUnsignedShort">
- <corba:param mode="inout" name="inOutUnsignedShort" idltype="corba:ushort" />
+ <corba:param mode="inout" idltype="corba:ushort" name="inOutUnsignedShort" />
</corba:operation>
<wsdl:input name="getSetUnsignedShortRequest">
</wsdl:input>
@@ -2011,10 +2011,10 @@
</wsdl:operation>
<wsdl:operation name="testUnsignedShort">
<corba:operation name="testUnsignedShort">
- <corba:param mode="in" name="inUnsignedShort" idltype="corba:ushort" />
- <corba:param mode="out" name="outUnsignedShort" idltype="corba:ushort" />
- <corba:param mode="inout" name="inoutUnsignedShort" idltype="corba:ushort" />
- <corba:return name="return" idltype="corba:ushort" />
+ <corba:param mode="in" idltype="corba:ushort" name="inUnsignedShort" />
+ <corba:param mode="out" idltype="corba:ushort" name="outUnsignedShort" />
+ <corba:param mode="inout" idltype="corba:ushort" name="inoutUnsignedShort" />
+ <corba:return idltype="corba:ushort" name="return" />
</corba:operation>
<wsdl:input name="testUnsignedShortRequest">
</wsdl:input>
@@ -2023,7 +2023,7 @@
</wsdl:operation>
<wsdl:operation name="getLong">
<corba:operation name="getLong">
- <corba:param mode="out" name="outLong" idltype="corba:long" />
+ <corba:param mode="out" idltype="corba:long" name="outLong" />
</corba:operation>
<wsdl:input name="getLongRequest">
</wsdl:input>
@@ -2032,7 +2032,7 @@
</wsdl:operation>
<wsdl:operation name="setLong">
<corba:operation name="setLong">
- <corba:param mode="in" name="inLong" idltype="corba:long" />
+ <corba:param mode="in" idltype="corba:long" name="inLong" />
</corba:operation>
<wsdl:input name="setLongRequest">
</wsdl:input>
@@ -2041,7 +2041,7 @@
</wsdl:operation>
<wsdl:operation name="getSetLong">
<corba:operation name="getSetLong">
- <corba:param mode="inout" name="inOutLong" idltype="corba:long" />
+ <corba:param mode="inout" idltype="corba:long" name="inOutLong" />
</corba:operation>
<wsdl:input name="getSetLongRequest">
</wsdl:input>
@@ -2050,10 +2050,10 @@
</wsdl:operation>
<wsdl:operation name="testLong">
<corba:operation name="testLong">
- <corba:param mode="in" name="inLong" idltype="corba:long" />
- <corba:param mode="out" name="outLong" idltype="corba:long" />
- <corba:param mode="inout" name="inoutLong" idltype="corba:long" />
- <corba:return name="return" idltype="corba:long" />
+ <corba:param mode="in" idltype="corba:long" name="inLong" />
+ <corba:param mode="out" idltype="corba:long" name="outLong" />
+ <corba:param mode="inout" idltype="corba:long" name="inoutLong" />
+ <corba:return idltype="corba:long" name="return" />
</corba:operation>
<wsdl:input name="testLongRequest">
</wsdl:input>
@@ -2062,7 +2062,7 @@
</wsdl:operation>
<wsdl:operation name="getUnsignedLong">
<corba:operation name="getUnsignedLong">
- <corba:param mode="out" name="outUnsignedLong" idltype="corba:ulong" />
+ <corba:param mode="out" idltype="corba:ulong" name="outUnsignedLong" />
</corba:operation>
<wsdl:input name="getUnsignedLongRequest">
</wsdl:input>
@@ -2071,7 +2071,7 @@
</wsdl:operation>
<wsdl:operation name="setUnsignedLong">
<corba:operation name="setUnsignedLong">
- <corba:param mode="in" name="inUnsignedLong" idltype="corba:ulong" />
+ <corba:param mode="in" idltype="corba:ulong" name="inUnsignedLong" />
</corba:operation>
<wsdl:input name="setUnsignedLongRequest">
</wsdl:input>
@@ -2080,7 +2080,7 @@
</wsdl:operation>
<wsdl:operation name="getSetUnsignedLong">
<corba:operation name="getSetUnsignedLong">
- <corba:param mode="inout" name="inOutUnsignedLong" idltype="corba:ulong" />
+ <corba:param mode="inout" idltype="corba:ulong" name="inOutUnsignedLong" />
</corba:operation>
<wsdl:input name="getSetUnsignedLongRequest">
</wsdl:input>
@@ -2089,10 +2089,10 @@
</wsdl:operation>
<wsdl:operation name="testUnsignedLong">
<corba:operation name="testUnsignedLong">
- <corba:param mode="in" name="inUnsignedLong" idltype="corba:ulong" />
- <corba:param mode="out" name="outUnsignedLong" idltype="corba:ulong" />
- <corba:param mode="inout" name="inoutUnsignedLong" idltype="corba:ulong" />
- <corba:return name="return" idltype="corba:ulong" />
+ <corba:param mode="in" idltype="corba:ulong" name="inUnsignedLong" />
+ <corba:param mode="out" idltype="corba:ulong" name="outUnsignedLong" />
+ <corba:param mode="inout" idltype="corba:ulong" name="inoutUnsignedLong" />
+ <corba:return idltype="corba:ulong" name="return" />
</corba:operation>
<wsdl:input name="testUnsignedLongRequest">
</wsdl:input>
@@ -2101,7 +2101,7 @@
</wsdl:operation>
<wsdl:operation name="getLongLong">
<corba:operation name="getLongLong">
- <corba:param mode="out" name="outLong" idltype="corba:longlong" />
+ <corba:param mode="out" idltype="corba:longlong" name="outLong" />
</corba:operation>
<wsdl:input name="getLongLongRequest">
</wsdl:input>
@@ -2110,7 +2110,7 @@
</wsdl:operation>
<wsdl:operation name="setLongLong">
<corba:operation name="setLongLong">
- <corba:param mode="in" name="inLong" idltype="corba:longlong" />
+ <corba:param mode="in" idltype="corba:longlong" name="inLong" />
</corba:operation>
<wsdl:input name="setLongLongRequest">
</wsdl:input>
@@ -2119,7 +2119,7 @@
</wsdl:operation>
<wsdl:operation name="getSetLongLong">
<corba:operation name="getSetLongLong">
- <corba:param mode="inout" name="inoutLong" idltype="corba:longlong" />
+ <corba:param mode="inout" idltype="corba:longlong" name="inoutLong" />
</corba:operation>
<wsdl:input name="getSetLongLongRequest">
</wsdl:input>
@@ -2128,10 +2128,10 @@
</wsdl:operation>
<wsdl:operation name="testUnsignedLongLong">
<corba:operation name="testUnsignedLongLong">
- <corba:param mode="in" name="inLongLong" idltype="corba:longlong" />
- <corba:param mode="out" name="outLongLong" idltype="corba:longlong" />
- <corba:param mode="inout" name="inoutLongLong" idltype="corba:longlong" />
- <corba:return name="return" idltype="corba:longlong" />
+ <corba:param mode="in" idltype="corba:longlong" name="inLongLong" />
+ <corba:param mode="out" idltype="corba:longlong" name="outLongLong" />
+ <corba:param mode="inout" idltype="corba:longlong" name="inoutLongLong" />
+ <corba:return idltype="corba:longlong" name="return" />
</corba:operation>
<wsdl:input name="testUnsignedLongLongRequest">
</wsdl:input>
@@ -2140,7 +2140,7 @@
</wsdl:operation>
<wsdl:operation name="getUnsignedLongLong">
<corba:operation name="getUnsignedLongLong">
- <corba:param mode="out" name="outUnsignedLongLong" idltype="corba:ulonglong" />
+ <corba:param mode="out" idltype="corba:ulonglong" name="outUnsignedLongLong" />
</corba:operation>
<wsdl:input name="getUnsignedLongLongRequest">
</wsdl:input>
@@ -2149,7 +2149,7 @@
</wsdl:operation>
<wsdl:operation name="setUnsignedLongLong">
<corba:operation name="setUnsignedLongLong">
- <corba:param mode="in" name="inUnsignedLongLong" idltype="corba:ulonglong" />
+ <corba:param mode="in" idltype="corba:ulonglong" name="inUnsignedLongLong" />
</corba:operation>
<wsdl:input name="setUnsignedLongLongRequest">
</wsdl:input>
@@ -2158,7 +2158,7 @@
</wsdl:operation>
<wsdl:operation name="getSetUnsignedLongLong">
<corba:operation name="getSetUnsignedLongLong">
- <corba:param mode="inout" name="inOutUnsignedLongLong" idltype="corba:ulonglong" />
+ <corba:param mode="inout" idltype="corba:ulonglong" name="inOutUnsignedLongLong" />
</corba:operation>
<wsdl:input name="getSetUnsignedLongLongRequest">
</wsdl:input>
@@ -2167,10 +2167,10 @@
</wsdl:operation>
<wsdl:operation name="testUnsignedLongLong">
<corba:operation name="testUnsignedLongLong">
- <corba:param mode="in" name="inUnsignedLongLong" idltype="corba:ulonglong" />
- <corba:param mode="out" name="outUnsignedLongLong" idltype="corba:ulonglong" />
- <corba:param mode="inout" name="inoutUnsignedLongLong" idltype="corba:ulonglong" />
- <corba:return name="return" idltype="corba:ulonglong" />
+ <corba:param mode="in" idltype="corba:ulonglong" name="inUnsignedLongLong" />
+ <corba:param mode="out" idltype="corba:ulonglong" name="outUnsignedLongLong" />
+ <corba:param mode="inout" idltype="corba:ulonglong" name="inoutUnsignedLongLong" />
+ <corba:return idltype="corba:ulonglong" name="return" />
</corba:operation>
<wsdl:input name="testUnsignedLongLongRequest">
</wsdl:input>
@@ -2179,7 +2179,7 @@
</wsdl:operation>
<wsdl:operation name="getFloat">
<corba:operation name="getFloat">
- <corba:param mode="out" name="outFloat" idltype="corba:float" />
+ <corba:param mode="out" idltype="corba:float" name="outFloat" />
</corba:operation>
<wsdl:input name="getFloatRequest">
</wsdl:input>
@@ -2188,7 +2188,7 @@
</wsdl:operation>
<wsdl:operation name="setFloat">
<corba:operation name="setFloat">
- <corba:param mode="in" name="inFloat" idltype="corba:float" />
+ <corba:param mode="in" idltype="corba:float" name="inFloat" />
</corba:operation>
<wsdl:input name="setFloatRequest">
</wsdl:input>
@@ -2197,7 +2197,7 @@
</wsdl:operation>
<wsdl:operation name="getSetFloat">
<corba:operation name="getSetFloat">
- <corba:param mode="inout" name="inOutFloat" idltype="corba:float" />
+ <corba:param mode="inout" idltype="corba:float" name="inOutFloat" />
</corba:operation>
<wsdl:input name="getSetFloatRequest">
</wsdl:input>
@@ -2206,10 +2206,10 @@
</wsdl:operation>
<wsdl:operation name="testFloat">
<corba:operation name="testFloat">
- <corba:param mode="in" name="inFloat" idltype="corba:float" />
- <corba:param mode="out" name="outFloat" idltype="corba:float" />
- <corba:param mode="inout" name="inoutFloat" idltype="corba:float" />
- <corba:return name="return" idltype="corba:float" />
+ <corba:param mode="in" idltype="corba:float" name="inFloat" />
+ <corba:param mode="out" idltype="corba:float" name="outFloat" />
+ <corba:param mode="inout" idltype="corba:float" name="inoutFloat" />
+ <corba:return idltype="corba:float" name="return" />
</corba:operation>
<wsdl:input name="testFloatRequest">
</wsdl:input>
@@ -2218,7 +2218,7 @@
</wsdl:operation>
<wsdl:operation name="getDouble">
<corba:operation name="getDouble">
- <corba:param mode="out" name="outDouble" idltype="corba:double" />
+ <corba:param mode="out" idltype="corba:double" name="outDouble" />
</corba:operation>
<wsdl:input name="getDoubleRequest">
</wsdl:input>
@@ -2227,7 +2227,7 @@
</wsdl:operation>
<wsdl:operation name="setDouble">
<corba:operation name="setDouble">
- <corba:param mode="in" name="inDouble" idltype="corba:double" />
+ <corba:param mode="in" idltype="corba:double" name="inDouble" />
</corba:operation>
<wsdl:input name="setDoubleRequest">
</wsdl:input>
@@ -2236,7 +2236,7 @@
</wsdl:operation>
<wsdl:operation name="getSetDouble">
<corba:operation name="getSetDouble">
- <corba:param mode="inout" name="inOutDouble" idltype="corba:double" />
+ <corba:param mode="inout" idltype="corba:double" name="inOutDouble" />
</corba:operation>
<wsdl:input name="getSetDoubleRequest">
</wsdl:input>
@@ -2245,10 +2245,10 @@
</wsdl:operation>
<wsdl:operation name="testDouble">
<corba:operation name="testDouble">
- <corba:param mode="in" name="inDouble" idltype="corba:double" />
- <corba:param mode="out" name="outDouble" idltype="corba:double" />
- <corba:param mode="inout" name="inoutDouble" idltype="corba:double" />
- <corba:return name="return" idltype="corba:double" />
+ <corba:param mode="in" idltype="corba:double" name="inDouble" />
+ <corba:param mode="out" idltype="corba:double" name="outDouble" />
+ <corba:param mode="inout" idltype="corba:double" name="inoutDouble" />
+ <corba:return idltype="corba:double" name="return" />
</corba:operation>
<wsdl:input name="testDoubleRequest">
</wsdl:input>
@@ -2257,7 +2257,7 @@
</wsdl:operation>
<wsdl:operation name="getChar">
<corba:operation name="getChar">
- <corba:param mode="out" name="outChar" idltype="corba:char" />
+ <corba:param mode="out" idltype="corba:char" name="outChar" />
</corba:operation>
<wsdl:input name="getCharRequest">
</wsdl:input>
@@ -2266,7 +2266,7 @@
</wsdl:operation>
<wsdl:operation name="setChar">
<corba:operation name="setChar">
- <corba:param mode="in" name="inChar" idltype="corba:char" />
+ <corba:param mode="in" idltype="corba:char" name="inChar" />
</corba:operation>
<wsdl:input name="setCharRequest">
</wsdl:input>
@@ -2275,7 +2275,7 @@
</wsdl:operation>
<wsdl:operation name="getSetChar">
<corba:operation name="getSetChar">
- <corba:param mode="inout" name="inOutChar" idltype="corba:char" />
+ <corba:param mode="inout" idltype="corba:char" name="inOutChar" />
</corba:operation>
<wsdl:input name="getSetCharRequest">
</wsdl:input>
@@ -2284,10 +2284,10 @@
</wsdl:operation>
<wsdl:operation name="testChar">
<corba:operation name="testChar">
- <corba:param mode="in" name="inChar" idltype="corba:char" />
- <corba:param mode="out" name="outChar" idltype="corba:char" />
- <corba:param mode="inout" name="inoutChar" idltype="corba:char" />
- <corba:return name="return" idltype="corba:char" />
+ <corba:param mode="in" idltype="corba:char" name="inChar" />
+ <corba:param mode="out" idltype="corba:char" name="outChar" />
+ <corba:param mode="inout" idltype="corba:char" name="inoutChar" />
+ <corba:return idltype="corba:char" name="return" />
</corba:operation>
<wsdl:input name="testCharRequest">
</wsdl:input>
@@ -2296,7 +2296,7 @@
</wsdl:operation>
<wsdl:operation name="getWChar">
<corba:operation name="getWChar">
- <corba:param mode="out" name="outWChar" idltype="corba:wchar" />
+ <corba:param mode="out" idltype="corba:wchar" name="outWChar" />
</corba:operation>
<wsdl:input name="getWCharRequest">
</wsdl:input>
@@ -2305,7 +2305,7 @@
</wsdl:operation>
<wsdl:operation name="setWChar">
<corba:operation name="setWChar">
- <corba:param mode="in" name="inWChar" idltype="corba:wchar" />
+ <corba:param mode="in" idltype="corba:wchar" name="inWChar" />
</corba:operation>
<wsdl:input name="setWCharRequest">
</wsdl:input>
@@ -2314,7 +2314,7 @@
</wsdl:operation>
<wsdl:operation name="getSetWChar">
<corba:operation name="getSetWChar">
- <corba:param mode="inout" name="inOutWChar" idltype="corba:wchar" />
+ <corba:param mode="inout" idltype="corba:wchar" name="inOutWChar" />
</corba:operation>
<wsdl:input name="getSetWCharRequest">
</wsdl:input>
@@ -2323,10 +2323,10 @@
</wsdl:operation>
<wsdl:operation name="testWchar">
<corba:operation name="testWchar">
- <corba:param mode="in" name="inWchar" idltype="corba:wchar" />
- <corba:param mode="out" name="outWchar" idltype="corba:wchar" />
- <corba:param mode="inout" name="inoutWchar" idltype="corba:wchar" />
- <corba:return name="return" idltype="corba:wchar" />
+ <corba:param mode="in" idltype="corba:wchar" name="inWchar" />
+ <corba:param mode="out" idltype="corba:wchar" name="outWchar" />
+ <corba:param mode="inout" idltype="corba:wchar" name="inoutWchar" />
+ <corba:return idltype="corba:wchar" name="return" />
</corba:operation>
<wsdl:input name="testWcharRequest">
</wsdl:input>
@@ -2335,7 +2335,7 @@
</wsdl:operation>
<wsdl:operation name="getBoolean">
<corba:operation name="getBoolean">
- <corba:param mode="out" name="outBoolean" idltype="corba:boolean" />
+ <corba:param mode="out" idltype="corba:boolean" name="outBoolean" />
</corba:operation>
<wsdl:input name="getBooleanRequest">
</wsdl:input>
@@ -2344,7 +2344,7 @@
</wsdl:operation>
<wsdl:operation name="setBoolean">
<corba:operation name="setBoolean">
- <corba:param mode="in" name="inBoolean" idltype="corba:boolean" />
+ <corba:param mode="in" idltype="corba:boolean" name="inBoolean" />
</corba:operation>
<wsdl:input name="setBooleanRequest">
</wsdl:input>
@@ -2353,7 +2353,7 @@
</wsdl:operation>
<wsdl:operation name="getSetBoolean">
<corba:operation name="getSetBoolean">
- <corba:param mode="inout" name="inOutBoolean" idltype="corba:boolean" />
+ <corba:param mode="inout" idltype="corba:boolean" name="inOutBoolean" />
</corba:operation>
<wsdl:input name="getSetBooleanRequest">
</wsdl:input>
@@ -2362,10 +2362,10 @@
</wsdl:operation>
<wsdl:operation name="testBoolean">
<corba:operation name="testBoolean">
- <corba:param mode="in" name="inBoolean" idltype="corba:boolean" />
- <corba:param mode="inout" name="inoutBoolean" idltype="corba:boolean" />
- <corba:param mode="out" name="outBoolean" idltype="corba:boolean" />
- <corba:return name="return" idltype="corba:boolean" />
+ <corba:param mode="in" idltype="corba:boolean" name="inBoolean" />
+ <corba:param mode="inout" idltype="corba:boolean" name="inoutBoolean" />
+ <corba:param mode="out" idltype="corba:boolean" name="outBoolean" />
+ <corba:return idltype="corba:boolean" name="return" />
</corba:operation>
<wsdl:input name="testBooleanRequest">
</wsdl:input>
@@ -2374,7 +2374,7 @@
</wsdl:operation>
<wsdl:operation name="getOctet">
<corba:operation name="getOctet">
- <corba:param mode="out" name="outOctet" idltype="corba:octet" />
+ <corba:param mode="out" idltype="corba:octet" name="outOctet" />
</corba:operation>
<wsdl:input name="getOctetRequest">
</wsdl:input>
@@ -2383,7 +2383,7 @@
</wsdl:operation>
<wsdl:operation name="setOctet">
<corba:operation name="setOctet">
- <corba:param mode="in" name="inOctet" idltype="corba:octet" />
+ <corba:param mode="in" idltype="corba:octet" name="inOctet" />
</corba:operation>
<wsdl:input name="setOctetRequest">
</wsdl:input>
@@ -2392,7 +2392,7 @@
</wsdl:operation>
<wsdl:operation name="getSetOctet">
<corba:operation name="getSetOctet">
- <corba:param mode="inout" name="inOutOctet" idltype="corba:octet" />
+ <corba:param mode="inout" idltype="corba:octet" name="inOutOctet" />
</corba:operation>
<wsdl:input name="getSetOctetRequest">
</wsdl:input>
@@ -2401,10 +2401,10 @@
</wsdl:operation>
<wsdl:operation name="testOctet">
<corba:operation name="testOctet">
- <corba:param mode="in" name="inOctet" idltype="corba:octet" />
- <corba:param mode="out" name="outOctet" idltype="corba:octet" />
- <corba:param mode="inout" name="inoutOctet" idltype="corba:octet" />
- <corba:return name="return" idltype="corba:octet" />
+ <corba:param mode="in" idltype="corba:octet" name="inOctet" />
+ <corba:param mode="out" idltype="corba:octet" name="outOctet" />
+ <corba:param mode="inout" idltype="corba:octet" name="inoutOctet" />
+ <corba:return idltype="corba:octet" name="return" />
</corba:operation>
<wsdl:input name="testOctetRequest">
</wsdl:input>
@@ -2413,7 +2413,7 @@
</wsdl:operation>
<wsdl:operation name="getAny">
<corba:operation name="getAny">
- <corba:param mode="out" name="outAny" idltype="corba:any" />
+ <corba:param mode="out" idltype="corba:any" name="outAny" />
</corba:operation>
<wsdl:input name="getAnyRequest">
</wsdl:input>
@@ -2422,7 +2422,7 @@
</wsdl:operation>
<wsdl:operation name="setAny">
<corba:operation name="setAny">
- <corba:param mode="in" name="inAny" idltype="corba:any" />
+ <corba:param mode="in" idltype="corba:any" name="inAny" />
</corba:operation>
<wsdl:input name="setAnyRequest">
</wsdl:input>
@@ -2431,7 +2431,7 @@
</wsdl:operation>
<wsdl:operation name="getSetAny">
<corba:operation name="getSetAny">
- <corba:param mode="inout" name="inOutAny" idltype="corba:any" />
+ <corba:param mode="inout" idltype="corba:any" name="inOutAny" />
</corba:operation>
<wsdl:input name="getSetAnyRequest">
</wsdl:input>
@@ -2440,10 +2440,10 @@
</wsdl:operation>
<wsdl:operation name="testAny">
<corba:operation name="testAny">
- <corba:param mode="in" name="inAny" idltype="corba:any" />
- <corba:param mode="out" name="outAny" idltype="corba:any" />
- <corba:param mode="inout" name="inoutAny" idltype="corba:any" />
- <corba:return name="return" idltype="corba:any" />
+ <corba:param mode="in" idltype="corba:any" name="inAny" />
+ <corba:param mode="out" idltype="corba:any" name="outAny" />
+ <corba:param mode="inout" idltype="corba:any" name="inoutAny" />
+ <corba:return idltype="corba:any" name="return" />
</corba:operation>
<wsdl:input name="testAnyRequest">
</wsdl:input>
@@ -2452,7 +2452,7 @@
</wsdl:operation>
<wsdl:operation name="getString">
<corba:operation name="getString">
- <corba:param mode="out" name="outString" idltype="corba:string" />
+ <corba:param mode="out" idltype="corba:string" name="outString" />
</corba:operation>
<wsdl:input name="getStringRequest">
</wsdl:input>
@@ -2461,7 +2461,7 @@
</wsdl:operation>
<wsdl:operation name="setString">
<corba:operation name="setString">
- <corba:param mode="in" name="inString" idltype="corba:string" />
+ <corba:param mode="in" idltype="corba:string" name="inString" />
</corba:operation>
<wsdl:input name="setStringRequest">
</wsdl:input>
@@ -2470,7 +2470,7 @@
</wsdl:operation>
<wsdl:operation name="getSetString">
<corba:operation name="getSetString">
- <corba:param mode="inout" name="inOutString" idltype="corba:string" />
+ <corba:param mode="inout" idltype="corba:string" name="inOutString" />
</corba:operation>
<wsdl:input name="getSetStringRequest">
</wsdl:input>
@@ -2479,10 +2479,10 @@
</wsdl:operation>
<wsdl:operation name="testString">
<corba:operation name="testString">
- <corba:param mode="in" name="inString" idltype="corba:string" />
- <corba:param mode="inout" name="inoutString" idltype="corba:string" />
- <corba:param mode="out" name="outString" idltype="corba:string" />
- <corba:return name="return" idltype="corba:string" />
+ <corba:param mode="in" idltype="corba:string" name="inString" />
+ <corba:param mode="inout" idltype="corba:string" name="inoutString" />
+ <corba:param mode="out" idltype="corba:string" name="outString" />
+ <corba:return idltype="corba:string" name="return" />
</corba:operation>
<wsdl:input name="testStringRequest">
</wsdl:input>
@@ -2491,7 +2491,7 @@
</wsdl:operation>
<wsdl:operation name="getWstring">
<corba:operation name="getWstring">
- <corba:param mode="out" name="outWstring" idltype="corba:wstring" />
+ <corba:param mode="out" idltype="corba:wstring" name="outWstring" />
</corba:operation>
<wsdl:input name="getWstringRequest">
</wsdl:input>
@@ -2500,7 +2500,7 @@
</wsdl:operation>
<wsdl:operation name="setWstring">
<corba:operation name="setWstring">
- <corba:param mode="in" name="inWstring" idltype="corba:wstring" />
+ <corba:param mode="in" idltype="corba:wstring" name="inWstring" />
</corba:operation>
<wsdl:input name="setWstringRequest">
</wsdl:input>
@@ -2509,7 +2509,7 @@
</wsdl:operation>
<wsdl:operation name="getSetWstring">
<corba:operation name="getSetWstring">
- <corba:param mode="inout" name="inOutWstring" idltype="corba:wstring" />
+ <corba:param mode="inout" idltype="corba:wstring" name="inOutWstring" />
</corba:operation>
<wsdl:input name="getSetWstringRequest">
</wsdl:input>
@@ -2518,10 +2518,10 @@
</wsdl:operation>
<wsdl:operation name="testWstring">
<corba:operation name="testWstring">
- <corba:param mode="in" name="inWstring" idltype="corba:wstring" />
- <corba:param mode="inout" name="inoutWstring" idltype="corba:wstring" />
- <corba:param mode="out" name="outWstring" idltype="corba:wstring" />
- <corba:return name="return" idltype="corba:wstring" />
+ <corba:param mode="in" idltype="corba:wstring" name="inWstring" />
+ <corba:param mode="inout" idltype="corba:wstring" name="inoutWstring" />
+ <corba:param mode="out" idltype="corba:wstring" name="outWstring" />
+ <corba:return idltype="corba:wstring" name="return" />
</corba:operation>
<wsdl:input name="testWstringRequest">
</wsdl:input>
@@ -2530,7 +2530,7 @@
</wsdl:operation>
<wsdl:operation name="getStringArray">
<corba:operation name="getStringArray">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" mode="out" name="outStringArray" idltype="stringArray" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" mode="out" idltype="stringArray" name="outStringArray" />
</corba:operation>
<wsdl:input name="getStringArrayRequest">
</wsdl:input>
@@ -2539,7 +2539,7 @@
</wsdl:operation>
<wsdl:operation name="setStringArray">
<corba:operation name="setStringArray">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" mode="in" name="inStringArray" idltype="stringArray" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" mode="in" idltype="stringArray" name="inStringArray" />
</corba:operation>
<wsdl:input name="setStringArrayRequest">
</wsdl:input>
@@ -2548,7 +2548,7 @@
</wsdl:operation>
<wsdl:operation name="getSetStringArray">
<corba:operation name="getSetStringArray">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" mode="inout" name="inOutStringArray" idltype="stringArray" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" mode="inout" idltype="stringArray" name="inOutStringArray" />
</corba:operation>
<wsdl:input name="getSetStringArrayRequest">
</wsdl:input>
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Sequence.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Sequence.wsdl?view=diff&rev=513805&r1=513804&r2=513805
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Sequence.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Sequence.wsdl Fri Mar 2 07:20:09 2007
@@ -19,27 +19,27 @@
-->
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/Sequence" xmlns:tns="http://schemas.apache.org/yoko/idl/Sequence" 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/Sequence/typemap">
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:long" bound="0" repositoryID="IDL:longSequence:1.0" name="longSequence" type="ns4:longSequence" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:string" bound="0" repositoryID="IDL:stringSequence:1.0" name="stringSequence" type="ns4:stringSequence" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:long" bound="10" repositoryID="IDL:boundedLongSequence:1.0" name="boundedLongSequence" type="ns4:boundedLongSequence" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:string" bound="2" repositoryID="IDL:boundedStringSequence:1.0" name="boundedStringSequence" type="ns4:boundedStringSequence" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="longSequence" bound="0" repositoryID="IDL:longSequenceSequence:1.0" name="longSequenceSequence" type="ns4:longSequenceSequence" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="boundedLongSequence" bound="0" repositoryID="IDL:boundedLongSequenceSequence:1.0" name="boundedLongSequenceSequence" type="ns4:boundedLongSequenceSequence" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="longSequence" bound="30" repositoryID="IDL:longSequenceBoundedSequence:1.0" name="longSequenceBoundedSequence" type="ns4:longSequenceBoundedSequence" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="boundedLongSequence" bound="10" repositoryID="IDL:boundedLongSequenceBoundedSequence:1.0" name="boundedLongSequenceBoundedSequence" type="ns4:boundedLongSequenceBoundedSequence" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:float" bound="0" repositoryID="IDL:sequences/myFloat:1.0" name="sequences.myFloat" type="ns4:sequences.myFloat" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:double" bound="0" repositoryID="IDL:sequences/myDouble:1.0" name="sequences.myDouble" type="ns4:sequences.myDouble" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:longdouble" bound="0" repositoryID="IDL:sequences/myLongDouble:1.0" name="sequences.myLongDouble" type="ns4:sequences.myLongDouble" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:short" bound="0" repositoryID="IDL:sequences/myShort:1.0" name="sequences.myShort" type="ns4:sequences.myShort" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:long" bound="0" repositoryID="IDL:sequences/myLong:1.0" name="sequences.myLong" type="ns4:sequences.myLong" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:longlong" bound="0" repositoryID="IDL:sequences/myLonglong:1.0" name="sequences.myLonglong" type="ns4:sequences.myLonglong" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:ushort" bound="0" repositoryID="IDL:sequences/myUnsignedShort:1.0" name="sequences.myUnsignedShort" type="ns4:sequences.myUnsignedShort" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:ulong" bound="0" repositoryID="IDL:sequences/myUnsignedLong:1.0" name="sequences.myUnsignedLong" type="ns4:sequences.myUnsignedLong" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:ulonglong" bound="0" repositoryID="IDL:sequences/myUnsignedLongLong:1.0" name="sequences.myUnsignedLongLong" type="ns4:sequences.myUnsignedLongLong" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:char" bound="0" repositoryID="IDL:sequences/myChar:1.0" name="sequences.myChar" type="ns4:sequences.myChar" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:wchar" bound="0" repositoryID="IDL:sequences/myWchar:1.0" name="sequences.myWchar" type="ns4:sequences.myWchar" />
- <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:boolean" bound="0" repositoryID="IDL:sequences/myBoolean:1.0" name="sequences.myBoolean" type="ns4:sequences.myBoolean" />
- <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:octet" bound="0" repositoryID="IDL:sequences/myOctet:1.0" name="sequences.myOctet" type="xs:base64Binary" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:long" repositoryID="IDL:longSequence:1.0" name="longSequence" type="ns4:longSequence" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:string" repositoryID="IDL:stringSequence:1.0" name="stringSequence" type="ns4:stringSequence" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="10" elemtype="corba:long" repositoryID="IDL:boundedLongSequence:1.0" name="boundedLongSequence" type="ns4:boundedLongSequence" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="2" elemtype="corba:string" repositoryID="IDL:boundedStringSequence:1.0" name="boundedStringSequence" type="ns4:boundedStringSequence" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="longSequence" repositoryID="IDL:longSequenceSequence:1.0" name="longSequenceSequence" type="ns4:longSequenceSequence" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="boundedLongSequence" repositoryID="IDL:boundedLongSequenceSequence:1.0" name="boundedLongSequenceSequence" type="ns4:boundedLongSequenceSequence" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="30" elemtype="longSequence" repositoryID="IDL:longSequenceBoundedSequence:1.0" name="longSequenceBoundedSequence" type="ns4:longSequenceBoundedSequence" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="10" elemtype="boundedLongSequence" repositoryID="IDL:boundedLongSequenceBoundedSequence:1.0" name="boundedLongSequenceBoundedSequence" type="ns4:boundedLongSequenceBoundedSequence" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:float" repositoryID="IDL:sequences/myFloat:1.0" name="sequences.myFloat" type="ns4:sequences.myFloat" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:double" repositoryID="IDL:sequences/myDouble:1.0" name="sequences.myDouble" type="ns4:sequences.myDouble" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:longdouble" repositoryID="IDL:sequences/myLongDouble:1.0" name="sequences.myLongDouble" type="ns4:sequences.myLongDouble" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:short" repositoryID="IDL:sequences/myShort:1.0" name="sequences.myShort" type="ns4:sequences.myShort" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:long" repositoryID="IDL:sequences/myLong:1.0" name="sequences.myLong" type="ns4:sequences.myLong" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:longlong" repositoryID="IDL:sequences/myLonglong:1.0" name="sequences.myLonglong" type="ns4:sequences.myLonglong" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:ushort" repositoryID="IDL:sequences/myUnsignedShort:1.0" name="sequences.myUnsignedShort" type="ns4:sequences.myUnsignedShort" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:ulong" repositoryID="IDL:sequences/myUnsignedLong:1.0" name="sequences.myUnsignedLong" type="ns4:sequences.myUnsignedLong" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:ulonglong" repositoryID="IDL:sequences/myUnsignedLongLong:1.0" name="sequences.myUnsignedLongLong" type="ns4:sequences.myUnsignedLongLong" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:char" repositoryID="IDL:sequences/myChar:1.0" name="sequences.myChar" type="ns4:sequences.myChar" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:wchar" repositoryID="IDL:sequences/myWchar:1.0" name="sequences.myWchar" type="ns4:sequences.myWchar" />
+ <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:boolean" repositoryID="IDL:sequences/myBoolean:1.0" name="sequences.myBoolean" type="ns4:sequences.myBoolean" />
+ <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:octet" repositoryID="IDL:sequences/myOctet:1.0" name="sequences.myOctet" type="xs:base64Binary" />
</corba:typeMapping>
<wsdl:types>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence" xmlns:xs="http://www.w3.org/2001/XMLSchema">
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_String.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_String.wsdl?view=diff&rev=513805&r1=513804&r2=513805
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_String.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_String.wsdl Fri Mar 2 07:20:09 2007
@@ -28,12 +28,12 @@
<corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="corba:string" repositoryID="IDL:myString:1.0" name="myString" type="xs:string" />
<corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="corba:wstring" repositoryID="IDL:myWString:1.0" name="myWString" type="xs:string" />
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" repositoryID="IDL:strStruct:1.0" name="strStruct" type="ns4:strStruct">
- <corba:member name="unboundedStr" idltype="corba:string" />
- <corba:member name="boundedStr10" idltype="string10" />
- <corba:member name="unboundedWStr" idltype="corba:wstring" />
- <corba:member name="boundedWStr20" idltype="wstring20" />
- <corba:member name="myStringStruct" idltype="corba:string" />
- <corba:member name="myWStringStruct" idltype="corba:string" />
+ <corba:member idltype="corba:string" name="unboundedStr" />
+ <corba:member idltype="string10" name="boundedStr10" />
+ <corba:member idltype="corba:wstring" name="unboundedWStr" />
+ <corba:member idltype="wstring20" name="boundedWStr20" />
+ <corba:member idltype="corba:string" name="myStringStruct" />
+ <corba:member idltype="corba:string" name="myWStringStruct" />
</corba:struct>
</corba:typeMapping>
<wsdl:types>
@@ -146,9 +146,9 @@
<corba:binding repositoryID="IDL:if:1.0" />
<wsdl:operation name="combineStrings">
<corba:operation name="combineStrings">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/String/typemap" mode="in" name="string10Parm" idltype="string10" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/String/typemap" mode="in" name="myString10Parm" idltype="myString10" />
- <corba:return name="return" idltype="corba:string" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/String/typemap" mode="in" idltype="string10" name="string10Parm" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/String/typemap" mode="in" idltype="myString10" name="myString10Parm" />
+ <corba:return idltype="corba:string" name="return" />
</corba:operation>
<wsdl:input name="combineStringsRequest">
</wsdl:input>
@@ -157,9 +157,9 @@
</wsdl:operation>
<wsdl:operation name="combineWstrings">
<corba:operation name="combineWstrings">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/String/typemap" mode="in" name="wstring20Parm" idltype="wstring20" />
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/String/typemap" mode="in" name="myWString20Parm" idltype="myWString20" />
- <corba:return name="return" idltype="corba:string" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/String/typemap" mode="in" idltype="wstring20" name="wstring20Parm" />
+ <corba:param xmlns="http://schemas.apache.org/yoko/idl/String/typemap" mode="in" idltype="myWString20" name="myWString20Parm" />
+ <corba:return idltype="corba:string" name="return" />
</corba:operation>
<wsdl:input name="combineWstringsRequest">
</wsdl:input>