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 br...@apache.org on 2007/04/30 13:09:53 UTC
svn commit: r533738 [3/4] - in /incubator/yoko/trunk:
bindings/src/main/java/org/apache/yoko/bindings/corba/types/
tools/src/main/java/org/apache/yoko/tools/processors/idl/
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=533738&r1=533737&r2=533738
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Declarators.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Declarators.wsdl Mon Apr 30 06:09:51 2007
@@ -19,18 +19,18 @@
-->
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/Declarators" xmlns:tns="http://schemas.apache.org/yoko/idl/Declarators" 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/Declarators/typemap">
- <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:long" repositoryID="IDL:long1:1.0" name="long1" type="xs:int" />
- <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:long" repositoryID="IDL:long2:1.0" name="long2" type="xs:int" />
- <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:long" repositoryID="IDL:long3:1.0" name="long3" type="xs:int" />
- <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:short" repositoryID="IDL:typedef_module/short1:1.0" name="typedef_module.short1" type="xs:short" />
- <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:short" repositoryID="IDL:typedef_module/short2:1.0" name="typedef_module.short2" type="xs:short" />
- <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:short" repositoryID="IDL:typedef_module/short3:1.0" name="typedef_module.short3" type="xs:short" />
- <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:ulonglong" repositoryID="IDL:ulonglong1:1.0" name="ulonglong1" type="xs:unsignedLong" />
- <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:ulonglong" repositoryID="IDL:ulonglong2:1.0" name="ulonglong2" type="xs:unsignedLong" />
- <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:ulonglong" repositoryID="IDL:ulonglong3:1.0" name="ulonglong3" type="xs:unsignedLong" />
- <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:ushort" repositoryID="IDL:typedef_module/ushort1:1.0" name="typedef_module.ushort1" type="xs:unsignedShort" />
- <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:ushort" repositoryID="IDL:typedef_module/ushort2:1.0" name="typedef_module.ushort2" type="xs:unsignedShort" />
- <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:ushort" repositoryID="IDL:typedef_module/ushort3:1.0" name="typedef_module.ushort3" type="xs:unsignedShort" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:long" repositoryID="IDL:long1:1.0" name="long1" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:long" repositoryID="IDL:long2:1.0" name="long2" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:long" repositoryID="IDL:long3:1.0" name="long3" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:short" repositoryID="IDL:typedef_module/short1:1.0" name="typedef_module.short1" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:short" repositoryID="IDL:typedef_module/short2:1.0" name="typedef_module.short2" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:short" repositoryID="IDL:typedef_module/short3:1.0" name="typedef_module.short3" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:ulonglong" repositoryID="IDL:ulonglong1:1.0" name="ulonglong1" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:ulonglong" repositoryID="IDL:ulonglong2:1.0" name="ulonglong2" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:ulonglong" repositoryID="IDL:ulonglong3:1.0" name="ulonglong3" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:ushort" repositoryID="IDL:typedef_module/ushort1:1.0" name="typedef_module.ushort1" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:ushort" repositoryID="IDL:typedef_module/ushort2:1.0" name="typedef_module.ushort2" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:ushort" repositoryID="IDL:typedef_module/ushort3:1.0" name="typedef_module.ushort3" />
<corba:anonarray xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" bound="12" name="_1_array1" type="corba:short" />
<corba:anonarray xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" bound="11" name="_2_array1" type="_1_array1" />
<corba:array xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" bound="10" repositoryID="IDL:array1:1.0" name="array1" type="_2_array1" />
@@ -43,9 +43,9 @@
<corba:anonarray xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" bound="21" name="array_module._1_array2" type="corba:short" />
<corba:array xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" bound="20" repositoryID="IDL:array_module/array2:1.0" name="array_module.array2" type="array_module._1_array2" />
<corba:array xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" bound="30" repositoryID="IDL:array_module/array3:1.0" name="array_module.array3" type="corba:short" />
- <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:long" repositoryID="IDL:simple_long:1.0" name="simple_long" type="xs:int" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="corba:long" repositoryID="IDL:simple_long:1.0" name="simple_long" />
<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:alias 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" />
<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" />
@@ -75,26 +75,26 @@
<corba:member name="aLong" idltype="corba:long" />
<corba:member name="aString" idltype="corba:string" />
</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:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="testStruct" repositoryID="IDL:struct1:1.0" name="struct1" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="testStruct" repositoryID="IDL:struct2:1.0" name="struct2" />
<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: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:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="struct_module.testStruct" repositoryID="IDL:struct_module/struct1:1.0" name="struct_module.struct1" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="struct_module.testStruct" repositoryID="IDL:struct_module/struct2:1.0" name="struct_module.struct2" />
<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: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:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefStruct" repositoryID="IDL:typedefStruct1:1.0" name="typedefStruct1" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefStruct" repositoryID="IDL:typedefStruct2:1.0" name="typedefStruct2" />
<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: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" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefStruct_module.typedefStruct" repositoryID="IDL:typedefStruct_module/typedefStruct1:1.0" name="typedefStruct_module.typedefStruct1" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefStruct_module.typedefStruct" repositoryID="IDL:typedefStruct_module/typedefStruct2:1.0" name="typedefStruct_module.typedefStruct2" />
<corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" repositoryID="IDL:aEnum:1.0" name="aEnum" type="ns4:aEnum">
<corba:enumerator value="e1_1" />
<corba:enumerator value="e1_2" />
@@ -117,9 +117,9 @@
</corba:unionbranch>
<corba:unionbranch name="u1_3" idltype="aStruct" default="true" />
</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" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="aUnion" repositoryID="IDL:union3:1.0" name="union3" type="ns4:aUnion" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="aUnion" repositoryID="IDL:union1:1.0" name="union1" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="aUnion" repositoryID="IDL:union2:1.0" name="union2" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="aUnion" repositoryID="IDL:union3:1.0" name="union3" />
<corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" repositoryID="IDL:union_module/aEnum:1.0" name="union_module.aEnum" type="ns4:union_module.aEnum">
<corba:enumerator value="e1_1" />
<corba:enumerator value="e1_2" />
@@ -142,9 +142,9 @@
</corba:unionbranch>
<corba:unionbranch name="u1_3" idltype="union_module.aStruct" default="true" />
</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:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="union_module.aUnion" repositoryID="IDL:union_module/union1:1.0" name="union_module.union1" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="union_module.aUnion" repositoryID="IDL:union_module/union2:1.0" name="union_module.union2" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="union_module.aUnion" repositoryID="IDL:union_module/union3:1.0" name="union_module.union3" />
<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:case label="e1_1" />
@@ -156,9 +156,9 @@
</corba:unionbranch>
<corba:unionbranch name="u1_3" idltype="aStruct" default="true" />
</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:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefUnion" repositoryID="IDL:typedefUnion1:1.0" name="typedefUnion1" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefUnion" repositoryID="IDL:typedefUnion2:1.0" name="typedefUnion2" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefUnion" repositoryID="IDL:typedefUnion3:1.0" name="typedefUnion3" />
<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:case label="e1_1" />
@@ -170,87 +170,39 @@
</corba:unionbranch>
<corba:unionbranch name="u1_3" idltype="aStruct" default="true" />
</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" />
- <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/typedefUnion3:1.0" name="typedefUnion_module.typedefUnion3" type="ns4:typedefUnion_module.typedefUnion" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefUnion_module.typedefUnion" repositoryID="IDL:typedefUnion_module/typedefUnion1:1.0" name="typedefUnion_module.typedefUnion1" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefUnion_module.typedefUnion" repositoryID="IDL:typedefUnion_module/typedefUnion2:1.0" name="typedefUnion_module.typedefUnion2" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefUnion_module.typedefUnion" repositoryID="IDL:typedefUnion_module/typedefUnion3:1.0" name="typedefUnion_module.typedefUnion3" />
<corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" repositoryID="IDL:testEnum:1.0" name="testEnum" type="ns4:testEnum">
<corba:enumerator value="te1" />
<corba:enumerator value="te2" />
<corba:enumerator value="te3" />
</corba:enum>
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="testEnum" repositoryID="IDL:enum1:1.0" name="enum1" type="ns4:testEnum" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="testEnum" repositoryID="IDL:enum2:1.0" name="enum2" type="ns4:testEnum" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="testEnum" repositoryID="IDL:enum3:1.0" name="enum3" type="ns4:testEnum" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="testEnum" repositoryID="IDL:testEnum_module/enum1:1.0" name="testEnum_module.enum1" type="ns4:testEnum" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="testEnum" repositoryID="IDL:testEnum_module/enum2:1.0" name="testEnum_module.enum2" type="ns4:testEnum" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="testEnum" repositoryID="IDL:testEnum_module/enum3:1.0" name="testEnum_module.enum3" type="ns4:testEnum" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="testEnum" repositoryID="IDL:enum1:1.0" name="enum1" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="testEnum" repositoryID="IDL:enum2:1.0" name="enum2" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="testEnum" repositoryID="IDL:enum3:1.0" name="enum3" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="testEnum" repositoryID="IDL:testEnum_module/enum1:1.0" name="testEnum_module.enum1" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="testEnum" repositoryID="IDL:testEnum_module/enum2:1.0" name="testEnum_module.enum2" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="testEnum" repositoryID="IDL:testEnum_module/enum3:1.0" name="testEnum_module.enum3" />
<corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" repositoryID="IDL:typedefEnum:1.0" name="typedefEnum" type="ns4:typedefEnum">
<corba:enumerator value="tde1" />
<corba:enumerator value="tde2" />
<corba:enumerator value="tde3" />
</corba:enum>
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefEnum" repositoryID="IDL:typedefEnum1:1.0" name="typedefEnum1" type="ns4:typedefEnum" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefEnum" repositoryID="IDL:typedefEnum2:1.0" name="typedefEnum2" type="ns4:typedefEnum" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefEnum" repositoryID="IDL:typedefEnum3:1.0" name="typedefEnum3" type="ns4:typedefEnum" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefEnum" repositoryID="IDL:typedefEnum1:1.0" name="typedefEnum1" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefEnum" repositoryID="IDL:typedefEnum2:1.0" name="typedefEnum2" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefEnum" repositoryID="IDL:typedefEnum3:1.0" name="typedefEnum3" />
<corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" repositoryID="IDL:typedefEnum_module/typedefEnum:1.0" name="typedefEnum_module.typedefEnum" type="ns4:typedefEnum_module.typedefEnum">
<corba:enumerator value="mtde1" />
<corba:enumerator value="mtde2" />
<corba:enumerator value="mtde3" />
</corba:enum>
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefEnum_module.typedefEnum" repositoryID="IDL:typedefEnum_module/typedefEnum1:1.0" name="typedefEnum_module.typedefEnum1" type="ns4:typedefEnum_module.typedefEnum" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefEnum_module.typedefEnum" repositoryID="IDL:typedefEnum_module/typedefEnum2:1.0" name="typedefEnum_module.typedefEnum2" type="ns4:typedefEnum_module.typedefEnum" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefEnum_module.typedefEnum" repositoryID="IDL:typedefEnum_module/typedefEnum3:1.0" name="typedefEnum_module.typedefEnum3" type="ns4:typedefEnum_module.typedefEnum" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefEnum_module.typedefEnum" repositoryID="IDL:typedefEnum_module/typedefEnum1:1.0" name="typedefEnum_module.typedefEnum1" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefEnum_module.typedefEnum" repositoryID="IDL:typedefEnum_module/typedefEnum2:1.0" name="typedefEnum_module.typedefEnum2" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Declarators/typemap" basetype="typedefEnum_module.typedefEnum" repositoryID="IDL:typedefEnum_module/typedefEnum3:1.0" name="typedefEnum_module.typedefEnum3" />
</corba:typeMapping>
<wsdl:types>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/Declarators" xmlns="http://schemas.apache.org/yoko/idl/Declarators" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:simpleType name="long1">
- <xs:restriction base="xs:int">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="long2">
- <xs:restriction base="xs:int">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="long3">
- <xs:restriction base="xs:int">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedef_module.short1">
- <xs:restriction base="xs:short">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedef_module.short2">
- <xs:restriction base="xs:short">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedef_module.short3">
- <xs:restriction base="xs:short">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="ulonglong1">
- <xs:restriction base="xs:unsignedLong">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="ulonglong2">
- <xs:restriction base="xs:unsignedLong">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="ulonglong3">
- <xs:restriction base="xs:unsignedLong">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedef_module.ushort1">
- <xs:restriction base="xs:unsignedShort">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedef_module.ushort2">
- <xs:restriction base="xs:unsignedShort">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedef_module.ushort3">
- <xs:restriction base="xs:unsignedShort">
- </xs:restriction>
- </xs:simpleType>
<xs:complexType name="_1_array1">
<xs:sequence>
<xs:element maxOccurs="12" minOccurs="12" name="item" type="xs:short">
@@ -323,23 +275,15 @@
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:simpleType name="simple_long">
- <xs:restriction base="xs:int">
- </xs:restriction>
- </xs:simpleType>
<xs:complexType name="array_long">
<xs:sequence>
- <xs:element maxOccurs="10" minOccurs="10" name="item" type="simple_long">
+ <xs:element maxOccurs="10" minOccurs="10" name="item" type="xs:int">
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:simpleType name="mixed_long_module.simple_long">
- <xs:restriction base="xs:int">
- </xs:restriction>
- </xs:simpleType>
<xs:complexType name="mixed_long_module.array_long">
<xs:sequence>
- <xs:element maxOccurs="10" minOccurs="10" name="item" type="mixed_long_module.simple_long">
+ <xs:element maxOccurs="10" minOccurs="10" name="item" type="xs:int">
</xs:element>
</xs:sequence>
</xs:complexType>
@@ -427,54 +371,6 @@
</xs:fractionDigits>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="string1">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="string2">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="string3">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="string_module.string1">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="string_module.string2">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="string_module.string3">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="wstring1">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="wstring2">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="wstring3">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="string_module.wstring1">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="string_module.wstring2">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="string_module.wstring3">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
<xs:complexType name="testStruct">
<xs:sequence>
<xs:element name="aLong" type="xs:int">
@@ -483,14 +379,6 @@
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:simpleType name="struct1">
- <xs:restriction base="testStruct">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="struct2">
- <xs:restriction base="testStruct">
- </xs:restriction>
- </xs:simpleType>
<xs:complexType name="struct_module.testStruct">
<xs:sequence>
<xs:element name="aLong" type="xs:int">
@@ -499,14 +387,6 @@
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:simpleType name="struct_module.struct1">
- <xs:restriction base="struct_module.testStruct">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="struct_module.struct2">
- <xs:restriction base="struct_module.testStruct">
- </xs:restriction>
- </xs:simpleType>
<xs:complexType name="typedefStruct">
<xs:sequence>
<xs:element name="ulonglong" type="xs:unsignedLong">
@@ -515,14 +395,6 @@
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:simpleType name="typedefStruct1">
- <xs:restriction base="typedefStruct">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedefStruct2">
- <xs:restriction base="typedefStruct">
- </xs:restriction>
- </xs:simpleType>
<xs:complexType name="typedefStruct_module.typedefStruct">
<xs:sequence>
<xs:element name="ulonglong" type="xs:unsignedLong">
@@ -531,14 +403,6 @@
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:simpleType name="typedefStruct_module.typedefStruct1">
- <xs:restriction base="typedefStruct_module.typedefStruct">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedefStruct_module.typedefStruct2">
- <xs:restriction base="typedefStruct_module.typedefStruct">
- </xs:restriction>
- </xs:simpleType>
<xs:simpleType name="aEnum">
<xs:restriction base="xs:string">
<xs:enumeration value="e1_1">
@@ -575,18 +439,6 @@
</xs:choice>
</xs:sequence>
</xs:complexType>
- <xs:simpleType name="union1">
- <xs:restriction base="aUnion">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="union2">
- <xs:restriction base="aUnion">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="union3">
- <xs:restriction base="aUnion">
- </xs:restriction>
- </xs:simpleType>
<xs:simpleType name="union_module.aEnum">
<xs:restriction base="xs:string">
<xs:enumeration value="e1_1">
@@ -623,18 +475,6 @@
</xs:choice>
</xs:sequence>
</xs:complexType>
- <xs:simpleType name="union_module.union1">
- <xs:restriction base="union_module.aUnion">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="union_module.union2">
- <xs:restriction base="union_module.aUnion">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="union_module.union3">
- <xs:restriction base="union_module.aUnion">
- </xs:restriction>
- </xs:simpleType>
<xs:complexType name="typedefUnion">
<xs:sequence>
<xs:element name="discriminator" type="aEnum">
@@ -649,18 +489,6 @@
</xs:choice>
</xs:sequence>
</xs:complexType>
- <xs:simpleType name="typedefUnion1">
- <xs:restriction base="typedefUnion">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedefUnion2">
- <xs:restriction base="typedefUnion">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedefUnion3">
- <xs:restriction base="typedefUnion">
- </xs:restriction>
- </xs:simpleType>
<xs:complexType name="typedefUnion_module.typedefUnion">
<xs:sequence>
<xs:element name="discriminator" type="aEnum">
@@ -675,18 +503,6 @@
</xs:choice>
</xs:sequence>
</xs:complexType>
- <xs:simpleType name="typedefUnion_module.typedefUnion1">
- <xs:restriction base="typedefUnion_module.typedefUnion">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedefUnion_module.typedefUnion2">
- <xs:restriction base="typedefUnion_module.typedefUnion">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedefUnion_module.typedefUnion3">
- <xs:restriction base="typedefUnion_module.typedefUnion">
- </xs:restriction>
- </xs:simpleType>
<xs:simpleType name="testEnum">
<xs:restriction base="xs:string">
<xs:enumeration value="te1">
@@ -697,30 +513,6 @@
</xs:enumeration>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="enum1">
- <xs:restriction base="testEnum">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="enum2">
- <xs:restriction base="testEnum">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="enum3">
- <xs:restriction base="testEnum">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="testEnum_module.enum1">
- <xs:restriction base="testEnum">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="testEnum_module.enum2">
- <xs:restriction base="testEnum">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="testEnum_module.enum3">
- <xs:restriction base="testEnum">
- </xs:restriction>
- </xs:simpleType>
<xs:simpleType name="typedefEnum">
<xs:restriction base="xs:string">
<xs:enumeration value="tde1">
@@ -731,18 +523,6 @@
</xs:enumeration>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="typedefEnum1">
- <xs:restriction base="typedefEnum">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedefEnum2">
- <xs:restriction base="typedefEnum">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedefEnum3">
- <xs:restriction base="typedefEnum">
- </xs:restriction>
- </xs:simpleType>
<xs:simpleType name="typedefEnum_module.typedefEnum">
<xs:restriction base="xs:string">
<xs:enumeration value="mtde1">
@@ -751,18 +531,6 @@
</xs:enumeration>
<xs:enumeration value="mtde3">
</xs:enumeration>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedefEnum_module.typedefEnum1">
- <xs:restriction base="typedefEnum_module.typedefEnum">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedefEnum_module.typedefEnum2">
- <xs:restriction base="typedefEnum_module.typedefEnum">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="typedefEnum_module.typedefEnum3">
- <xs:restriction base="typedefEnum_module.typedefEnum">
</xs:restriction>
</xs:simpleType>
<xs:element name="_get_ull1">
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_ForwardInterfaceException.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_ForwardInterfaceException.wsdl?view=diff&rev=533738&r1=533737&r2=533738
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_ForwardInterfaceException.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_ForwardInterfaceException.wsdl Mon Apr 30 06:09:51 2007
@@ -26,7 +26,7 @@
<corba:member name="error" idltype="IpCall" />
<corba:member name="code" idltype="corba:long" />
</corba:exception>
- <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceException/typemap" basetype="corba:long" repositoryID="IDL:IpCall/myLong:1.0" name="IpCall.myLong" type="xs:int" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceException/typemap" basetype="corba:long" repositoryID="IDL:IpCall/myLong:1.0" name="IpCall.myLong" />
<corba:object xmlns:ns5="http://www.w3.org/2005/08/addressing" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceException/typemap" xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceException" binding="IpCallCORBABinding" repositoryID="IDL:IpCall:1.0" name="ns4:IpCall" type="ns5:EndpointReferenceType" />
</corba:typeMapping>
<wsdl:types>
@@ -87,10 +87,6 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:simpleType name="IpCall.myLong">
- <xs:restriction base="xs:int">
- </xs:restriction>
- </xs:simpleType>
<xs:element name="IpCallRef" type="wsa:EndpointReferenceType">
<xs:annotation>
<xs:appinfo>
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_ForwardInterfaceTypedef.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_ForwardInterfaceTypedef.wsdl?view=diff&rev=533738&r1=533737&r2=533738
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_ForwardInterfaceTypedef.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_ForwardInterfaceTypedef.wsdl Mon Apr 30 06:09:51 2007
@@ -23,31 +23,27 @@
<corba:array xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" bound="2" repositoryID="IDL:TypedefIf/typedefCall/myIpCallArray:1.0" name="TypedefIf.typedefCall.myIpCallArray" type="TypedefIf.IpCall" />
<corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef" xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" elemtype="TypedefIf.IpCall" bound="0" repositoryID="IDL:TypedefIf/typedefCall/mySeqIpCall:1.0" name="TypedefIf.typedefCall.mySeqIpCall" type="ns4:TypedefIf.typedefCall.mySeqIpCall" />
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef" xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" repositoryID="IDL:TypedefIf/typedefCall/aStruct:1.0" name="TypedefIf.typedefCall.aStruct" type="ns4:TypedefIf.typedefCall.aStruct">
- <corba:member name="aStructMyLong" idltype="TypedefIf.typedefCall.myIpCall" />
+ <corba:member name="aStructMyLong" />
</corba:struct>
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef" xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" basetype="TypedefIf.typedefCall.aStruct" repositoryID="IDL:TypedefIf/typedefCall/myStruct:1.0" name="TypedefIf.typedefCall.myStruct" type="ns4:TypedefIf.typedefCall.aStruct" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" basetype="TypedefIf.typedefCall.aStruct" repositoryID="IDL:TypedefIf/typedefCall/myStruct:1.0" name="TypedefIf.typedefCall.myStruct" />
<corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef" xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" discriminator="corba:long" repositoryID="IDL:TypedefIf/typedefCall/aUnion:1.0" name="TypedefIf.typedefCall.aUnion" type="ns4:TypedefIf.typedefCall.aUnion">
- <corba:unionbranch name="aUnionMyLong" idltype="TypedefIf.typedefCall.myIpCall">
+ <corba:unionbranch name="aUnionMyLong">
<corba:case label="1" />
</corba:unionbranch>
<corba:unionbranch name="aUnionMyBoolean" idltype="corba:boolean" default="true" />
</corba:union>
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef" xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" basetype="TypedefIf.typedefCall.aUnion" repositoryID="IDL:TypedefIf/typedefCall/myUnion:1.0" name="TypedefIf.typedefCall.myUnion" type="ns4:TypedefIf.typedefCall.aUnion" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" basetype="TypedefIf.typedefCall.aUnion" repositoryID="IDL:TypedefIf/typedefCall/myUnion:1.0" name="TypedefIf.typedefCall.myUnion" />
<corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef" xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" repositoryID="IDL:TypedefIf/typedefCall/anotherStruct:1.0" name="TypedefIf.typedefCall.anotherStruct" type="ns4:TypedefIf.typedefCall.anotherStruct">
<corba:member name="myOtherLong" idltype="TypedefIf.IpCall" />
<corba:member name="anotherLong" idltype="corba:long" />
</corba:struct>
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef" xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" basetype="TypedefIf.typedefCall.anotherStruct" repositoryID="IDL:TypedefIf/typedefCall/myOtherStruct:1.0" name="TypedefIf.typedefCall.myOtherStruct" type="ns4:TypedefIf.typedefCall.anotherStruct" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" basetype="TypedefIf.typedefCall.anotherStruct" repositoryID="IDL:TypedefIf/typedefCall/myOtherStruct:1.0" name="TypedefIf.typedefCall.myOtherStruct" />
<corba:object xmlns:ns5="http://www.w3.org/2005/08/addressing" xmlns:ns4="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef" binding="TypedefIf.IpCallCORBABinding" repositoryID="IDL:TypedefIf/IpCall:1.0" name="ns4:TypedefIf.IpCall" type="ns5:EndpointReferenceType" />
</corba:typeMapping>
<wsdl:types>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef" xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="http://www.w3.org/2005/08/addressing/ws-addr.xsd">
</xs:import>
- <xs:simpleType name="TypedefIf.typedefCall.myIpCall">
- <xs:restriction base="wsa:EndpointReferenceType">
- </xs:restriction>
- </xs:simpleType>
<xs:complexType name="TypedefIf.typedefCall.myIpCallArray">
<xs:sequence>
<xs:element maxOccurs="2" minOccurs="2" name="item" nillable="true" type="wsa:EndpointReferenceType">
@@ -62,30 +58,22 @@
</xs:complexType>
<xs:complexType name="TypedefIf.typedefCall.aStruct">
<xs:sequence>
- <xs:element name="aStructMyLong" type="TypedefIf.typedefCall.myIpCall">
+ <xs:element name="aStructMyLong">
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:simpleType name="TypedefIf.typedefCall.myStruct">
- <xs:restriction base="TypedefIf.typedefCall.aStruct">
- </xs:restriction>
- </xs:simpleType>
<xs:complexType name="TypedefIf.typedefCall.aUnion">
<xs:sequence>
<xs:element name="discriminator" type="xs:int">
</xs:element>
<xs:choice>
- <xs:element name="aUnionMyLong" type="TypedefIf.typedefCall.myIpCall">
+ <xs:element name="aUnionMyLong">
</xs:element>
<xs:element name="aUnionMyBoolean" type="xs:boolean">
</xs:element>
</xs:choice>
</xs:sequence>
</xs:complexType>
- <xs:simpleType name="TypedefIf.typedefCall.myUnion">
- <xs:restriction base="TypedefIf.typedefCall.aUnion">
- </xs:restriction>
- </xs:simpleType>
<xs:complexType name="TypedefIf.typedefCall.anotherStruct">
<xs:sequence>
<xs:element name="myOtherLong" nillable="true" type="wsa:EndpointReferenceType">
@@ -94,22 +82,18 @@
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:simpleType name="TypedefIf.typedefCall.myOtherStruct">
- <xs:restriction base="TypedefIf.typedefCall.anotherStruct">
- </xs:restriction>
- </xs:simpleType>
<xs:element name="opIn">
<xs:complexType>
<xs:sequence>
- <xs:element name="inMyIpCall" type="TypedefIf.typedefCall.myIpCall">
+ <xs:element name="inMyIpCall">
</xs:element>
<xs:element name="inMySeqIpCall" type="TypedefIf.typedefCall.mySeqIpCall">
</xs:element>
- <xs:element name="inMyStruct" type="TypedefIf.typedefCall.myStruct">
+ <xs:element name="inMyStruct" type="TypedefIf.typedefCall.aStruct">
</xs:element>
- <xs:element name="inMyUnion" type="TypedefIf.typedefCall.myUnion">
+ <xs:element name="inMyUnion" type="TypedefIf.typedefCall.aUnion">
</xs:element>
- <xs:element name="inMyOtherStruct" type="TypedefIf.typedefCall.myOtherStruct">
+ <xs:element name="inMyOtherStruct" type="TypedefIf.typedefCall.anotherStruct">
</xs:element>
</xs:sequence>
</xs:complexType>
@@ -129,15 +113,15 @@
<xs:element name="opOutResponse">
<xs:complexType>
<xs:sequence>
- <xs:element name="outMyIpCall" type="TypedefIf.typedefCall.myIpCall">
+ <xs:element name="outMyIpCall">
</xs:element>
<xs:element name="outMySeqIpCall" type="TypedefIf.typedefCall.mySeqIpCall">
</xs:element>
- <xs:element name="outMyStruct" type="TypedefIf.typedefCall.myStruct">
+ <xs:element name="outMyStruct" type="TypedefIf.typedefCall.aStruct">
</xs:element>
- <xs:element name="outMyUnion" type="TypedefIf.typedefCall.myUnion">
+ <xs:element name="outMyUnion" type="TypedefIf.typedefCall.aUnion">
</xs:element>
- <xs:element name="outMyOtherStruct" type="TypedefIf.typedefCall.myOtherStruct">
+ <xs:element name="outMyOtherStruct" type="TypedefIf.typedefCall.anotherStruct">
</xs:element>
</xs:sequence>
</xs:complexType>
@@ -145,15 +129,15 @@
<xs:element name="opInOut">
<xs:complexType>
<xs:sequence>
- <xs:element name="inoutMyIpCall" type="TypedefIf.typedefCall.myIpCall">
+ <xs:element name="inoutMyIpCall">
</xs:element>
<xs:element name="inoutMySeqIpCall" type="TypedefIf.typedefCall.mySeqIpCall">
</xs:element>
- <xs:element name="inoutMyStruct" type="TypedefIf.typedefCall.myStruct">
+ <xs:element name="inoutMyStruct" type="TypedefIf.typedefCall.aStruct">
</xs:element>
- <xs:element name="inoutMyUnion" type="TypedefIf.typedefCall.myUnion">
+ <xs:element name="inoutMyUnion" type="TypedefIf.typedefCall.aUnion">
</xs:element>
- <xs:element name="inoutMyOtherStruct" type="TypedefIf.typedefCall.myOtherStruct">
+ <xs:element name="inoutMyOtherStruct" type="TypedefIf.typedefCall.anotherStruct">
</xs:element>
</xs:sequence>
</xs:complexType>
@@ -161,15 +145,15 @@
<xs:element name="opInOutResponse">
<xs:complexType>
<xs:sequence>
- <xs:element name="inoutMyIpCall" type="TypedefIf.typedefCall.myIpCall">
+ <xs:element name="inoutMyIpCall">
</xs:element>
<xs:element name="inoutMySeqIpCall" type="TypedefIf.typedefCall.mySeqIpCall">
</xs:element>
- <xs:element name="inoutMyStruct" type="TypedefIf.typedefCall.myStruct">
+ <xs:element name="inoutMyStruct" type="TypedefIf.typedefCall.aStruct">
</xs:element>
- <xs:element name="inoutMyUnion" type="TypedefIf.typedefCall.myUnion">
+ <xs:element name="inoutMyUnion" type="TypedefIf.typedefCall.aUnion">
</xs:element>
- <xs:element name="inoutMyOtherStruct" type="TypedefIf.typedefCall.myOtherStruct">
+ <xs:element name="inoutMyOtherStruct" type="TypedefIf.typedefCall.anotherStruct">
</xs:element>
</xs:sequence>
</xs:complexType>
@@ -258,7 +242,7 @@
<corba:binding repositoryID="IDL:TypedefIf/typedefCall:1.0" />
<wsdl:operation name="opIn">
<corba:operation name="opIn">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" mode="in" name="inMyIpCall" idltype="TypedefIf.typedefCall.myIpCall" />
+ <corba:param mode="in" name="inMyIpCall" />
<corba:param xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" mode="in" name="inMySeqIpCall" idltype="TypedefIf.typedefCall.mySeqIpCall" />
<corba:param xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" mode="in" name="inMyStruct" idltype="TypedefIf.typedefCall.myStruct" />
<corba:param xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" mode="in" name="inMyUnion" idltype="TypedefIf.typedefCall.myUnion" />
@@ -271,7 +255,7 @@
</wsdl:operation>
<wsdl:operation name="opOut">
<corba:operation name="opOut">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" mode="out" name="outMyIpCall" idltype="TypedefIf.typedefCall.myIpCall" />
+ <corba:param mode="out" name="outMyIpCall" />
<corba:param xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" mode="out" name="outMySeqIpCall" idltype="TypedefIf.typedefCall.mySeqIpCall" />
<corba:param xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" mode="out" name="outMyStruct" idltype="TypedefIf.typedefCall.myStruct" />
<corba:param xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" mode="out" name="outMyUnion" idltype="TypedefIf.typedefCall.myUnion" />
@@ -284,7 +268,7 @@
</wsdl:operation>
<wsdl:operation name="opInOut">
<corba:operation name="opInOut">
- <corba:param xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" mode="inout" name="inoutMyIpCall" idltype="TypedefIf.typedefCall.myIpCall" />
+ <corba:param mode="inout" name="inoutMyIpCall" />
<corba:param xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" mode="inout" name="inoutMySeqIpCall" idltype="TypedefIf.typedefCall.mySeqIpCall" />
<corba:param xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" mode="inout" name="inoutMyStruct" idltype="TypedefIf.typedefCall.myStruct" />
<corba:param xmlns="http://schemas.apache.org/yoko/idl/ForwardInterfaceTypedef/typemap" mode="inout" name="inoutMyUnion" idltype="TypedefIf.typedefCall.myUnion" />
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=533738&r1=533737&r2=533738
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_String.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_String.wsdl Mon Apr 30 06:09:51 2007
@@ -23,8 +23,8 @@
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="_1_string10" repositoryID="IDL:string10:1.0" name="string10" type="ns4:string10" />
<corba:anonwstring xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" bound="20" name="_1_wstring20" type="ns4:wstring20" />
<corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="_1_wstring20" repositoryID="IDL:wstring20:1.0" name="wstring20" type="ns4:wstring20" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="string10" repositoryID="IDL:myString10:1.0" name="myString10" type="ns4:string10" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="wstring20" repositoryID="IDL:myWString20:1.0" name="myWString20" type="ns4:wstring20" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="string10" repositoryID="IDL:myString10:1.0" name="myString10" />
+ <corba:alias xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="wstring20" repositoryID="IDL:myWString20:1.0" name="myWString20" />
<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">
@@ -50,22 +50,6 @@
</xs:maxLength>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="myString10">
- <xs:restriction base="string10">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="myWString20">
- <xs:restriction base="wstring20">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="myString">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="myWString">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
<xs:complexType name="strStruct">
<xs:sequence>
<xs:element name="unboundedStr" type="xs:string">
@@ -76,9 +60,9 @@
</xs:element>
<xs:element name="boundedWStr20" type="wstring20">
</xs:element>
- <xs:element name="myStringStruct" type="myString">
+ <xs:element name="myStringStruct" type="xs:string">
</xs:element>
- <xs:element name="myWStringStruct" type="myWString">
+ <xs:element name="myWStringStruct" type="xs:string">
</xs:element>
</xs:sequence>
</xs:complexType>
@@ -87,7 +71,7 @@
<xs:sequence>
<xs:element name="string10Parm" type="string10">
</xs:element>
- <xs:element name="myString10Parm" type="myString10">
+ <xs:element name="myString10Parm" type="string10">
</xs:element>
</xs:sequence>
</xs:complexType>
@@ -95,7 +79,7 @@
<xs:element name="combineStringsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element name="return" type="myString">
+ <xs:element name="return" type="xs:string">
</xs:element>
</xs:sequence>
</xs:complexType>
@@ -105,7 +89,7 @@
<xs:sequence>
<xs:element name="wstring20Parm" type="wstring20">
</xs:element>
- <xs:element name="myWString20Parm" type="myWString20">
+ <xs:element name="myWString20Parm" type="wstring20">
</xs:element>
</xs:sequence>
</xs:complexType>
@@ -113,7 +97,7 @@
<xs:element name="combineWstringsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element name="return" type="myWString">
+ <xs:element name="return" type="xs:string">
</xs:element>
</xs:sequence>
</xs:complexType>
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_String_unbounded.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_String_unbounded.wsdl?view=diff&rev=533738&r1=533737&r2=533738
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_String_unbounded.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_String_unbounded.wsdl Mon Apr 30 06:09:51 2007
@@ -21,8 +21,8 @@
<corba:typeMapping targetNamespace="http://schemas.apache.org/yoko/idl/String/typemap">
<corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="corba:string" repositoryID="IDL:string10:1.0" name="string10" 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:wstring20:1.0" name="wstring20" type="xs:string" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="string10" repositoryID="IDL:myString10:1.0" name="myString10" type="ns4:string10" />
- <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="wstring20" repositoryID="IDL:myWString20:1.0" name="myWString20" type="ns4:wstring20" />
+ <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="string10" repositoryID="IDL:myString10:1.0" name="myString10" />
+ <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="wstring20" repositoryID="IDL:myWString20:1.0" name="myWString20" />
<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">
@@ -36,52 +36,28 @@
</corba:typeMapping>
<wsdl:types>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:simpleType name="string10">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="wstring20">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="myString10">
- <xs:restriction base="string10">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="myWString20">
- <xs:restriction base="wstring20">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="myString">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="myWString">
- <xs:restriction base="xs:string">
- </xs:restriction>
- </xs:simpleType>
<xs:complexType name="strStruct">
<xs:sequence>
<xs:element name="unboundedStr" type="xs:string">
</xs:element>
- <xs:element name="boundedStr10" type="string10">
+ <xs:element name="boundedStr10" type="xs:string">
</xs:element>
<xs:element name="unboundedWStr" type="xs:string">
</xs:element>
- <xs:element name="boundedWStr20" type="wstring20">
+ <xs:element name="boundedWStr20" type="xs:string">
</xs:element>
- <xs:element name="myStringStruct" type="myString">
+ <xs:element name="myStringStruct" type="xs:string">
</xs:element>
- <xs:element name="myWStringStruct" type="myWString">
+ <xs:element name="myWStringStruct" type="xs:string">
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:element name="combineStrings">
<xs:complexType>
<xs:sequence>
- <xs:element name="string10Parm" type="string10">
+ <xs:element name="string10Parm" type="xs:string">
</xs:element>
- <xs:element name="myString10Parm" type="myString10">
+ <xs:element name="myString10Parm" type="xs:string">
</xs:element>
</xs:sequence>
</xs:complexType>
@@ -89,7 +65,7 @@
<xs:element name="combineStringsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element name="return" type="myString">
+ <xs:element name="return" type="xs:string">
</xs:element>
</xs:sequence>
</xs:complexType>
@@ -97,9 +73,9 @@
<xs:element name="combineWstrings">
<xs:complexType>
<xs:sequence>
- <xs:element name="wstring20Parm" type="wstring20">
+ <xs:element name="wstring20Parm" type="xs:string">
</xs:element>
- <xs:element name="myWString20Parm" type="myWString20">
+ <xs:element name="myWString20Parm" type="xs:string">
</xs:element>
</xs:sequence>
</xs:complexType>
@@ -107,7 +83,7 @@
<xs:element name="combineWstringsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element name="return" type="myWString">
+ <xs:element name="return" type="xs:string">
</xs:element>
</xs:sequence>
</xs:complexType>