incubator-yoko-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r495238 [2/3] - in /incubator/yoko/trunk: ./ bindings/ bindings/src/main/java/org/apache/yoko/bindings/corba/ bindings/src/main/java/org/apache/yoko/bindings/corba/interceptors/ bindings/src/main/java/org/apache/yoko/bindings/corba/types/ b...
Date Thu, 11 Jan 2007 14:38:19 GMT
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Anonsequence.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Anonsequence.wsdl?view=diff&rev=495238&r1=495237&r2=495238
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Anonsequence.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Anonsequence.wsdl Thu Jan 11 06:38:17 2007
@@ -36,87 +36,87 @@
       <corba:member name="structSeqSeqLong" idltype="_2_anonStruct" />
       <corba:member name="structSeqSeqSeqLong" idltype="_3_anonStruct" />
     </corba:struct>
-      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:short" bound="0" name="_1_anonTypedefStruct" type="ns4:_1_anonTypedefStruct" />
-      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:short" bound="0" name="anonTypedefStruct._1_anonTypedefStruct" type="ns4:anonTypedefStruct._1_anonTypedefStruct" />
-      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonTypedefStruct._1_anonTypedefStruct" bound="0" name="_2_anonTypedefStruct" type="ns4:_2_anonTypedefStruct" />
-      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:short" bound="0" name="anonTypedefStruct._2_anonTypedefStruct" type="ns4:anonTypedefStruct._2_anonTypedefStruct" />
-      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonTypedefStruct._2_anonTypedefStruct" bound="0" name="anonTypedefStruct._3_anonTypedefStruct" type="ns4:anonTypedefStruct._3_anonTypedefStruct" />
-      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonTypedefStruct._3_anonTypedefStruct" bound="0" name="_3_anonTypedefStruct" type="ns4:_3_anonTypedefStruct" />
-      <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" repositoryID="IDL:anonTypedefStruct:1.0" name="anonTypedefStruct" type="ns4:anonTypedefStruct">
-        <corba:member name="typedefStructSeqShort" idltype="_1_anonTypedefStruct" />
-        <corba:member name="typedefStructSeqSeqShort" idltype="_2_anonTypedefStruct" />
-        <corba:member name="typedefStructSeqSeqSeqShort" idltype="_3_anonTypedefStruct" />
-      </corba:struct>
-        <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" basetype="anonTypedefStruct" repositoryID="IDL:myAnonTypedefStruct:1.0" name="myAnonTypedefStruct" type="ns4:anonTypedefStruct" />
-        <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="_1_anonUnion" type="ns4:_1_anonUnion" />
-        <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="anonUnion._1_anonUnion" type="ns4:anonUnion._1_anonUnion" />
-        <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonUnion._1_anonUnion" bound="0" name="_2_anonUnion" type="ns4:_2_anonUnion" />
-        <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="anonUnion._2_anonUnion" type="ns4:anonUnion._2_anonUnion" />
-        <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonUnion._2_anonUnion" bound="0" name="anonUnion._3_anonUnion" type="ns4:anonUnion._3_anonUnion" />
-        <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonUnion._3_anonUnion" bound="0" name="_3_anonUnion" type="ns4:_3_anonUnion" />
-        <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" discriminator="corba:long" repositoryID="IDL:anonUnion:1.0" name="anonUnion" type="ns4:anonUnion">
-          <corba:unionbranch name="unionSeqLong" idltype="_1_anonUnion">
-            <corba:case label="1" />
-          </corba:unionbranch>
-            <corba:unionbranch name="unionSeqSeqLong" idltype="_2_anonUnion">
-              <corba:case label="2" />
-            </corba:unionbranch>
-              <corba:unionbranch name="unionSeqSeqSeqLong" idltype="_3_anonUnion" default="true" />
-            </corba:union>
-              <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="_1_anonTypedefUnion" type="ns4:_1_anonTypedefUnion" />
-              <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="anonTypedefUnion._1_anonTypedefUnion" type="ns4:anonTypedefUnion._1_anonTypedefUnion" />
-              <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonTypedefUnion._1_anonTypedefUnion" bound="0" name="_2_anonTypedefUnion" type="ns4:_2_anonTypedefUnion" />
-              <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="anonTypedefUnion._2_anonTypedefUnion" type="ns4:anonTypedefUnion._2_anonTypedefUnion" />
-              <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonTypedefUnion._2_anonTypedefUnion" bound="0" name="anonTypedefUnion._3_anonTypedefUnion" type="ns4:anonTypedefUnion._3_anonTypedefUnion" />
-              <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonTypedefUnion._3_anonTypedefUnion" bound="0" name="_3_anonTypedefUnion" type="ns4:_3_anonTypedefUnion" />
-              <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" discriminator="corba:long" repositoryID="IDL:anonTypedefUnion:1.0" name="anonTypedefUnion" type="ns4:anonTypedefUnion">
-                <corba:unionbranch name="typedefUnionSeqLong" idltype="_1_anonTypedefUnion">
-                  <corba:case label="1" />
-                </corba:unionbranch>
-                  <corba:unionbranch name="typedefUnionSeqSeqLong" idltype="_2_anonTypedefUnion">
-                    <corba:case label="2" />
-                  </corba:unionbranch>
-                    <corba:unionbranch name="typedefUnionSeqSeqSeqLong" idltype="_3_anonTypedefUnion" default="true" />
-                  </corba:union>
-                    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" basetype="anonTypedefUnion" repositoryID="IDL:myAnonUnion:1.0" name="myAnonUnion" type="ns4:anonTypedefUnion" />
-                    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="_1_anonException" type="ns4:_1_anonException" />
-                    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="anonException._1_anonException" type="ns4:anonException._1_anonException" />
-                    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonException._1_anonException" bound="0" name="_2_anonException" type="ns4:_2_anonException" />
-                    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="anonException._2_anonException" type="ns4:anonException._2_anonException" />
-                    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonException._2_anonException" bound="0" name="anonException._3_anonException" type="ns4:anonException._3_anonException" />
-                    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonException._3_anonException" bound="0" name="_3_anonException" type="ns4:_3_anonException" />
-                    <corba:exception xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" repositoryID="IDL:anonException:1.0" name="anonException" type="ns4:anonExceptionType">
-                      <corba:member name="exceptionSeqLong" idltype="_1_anonException" />
-                      <corba:member name="exceptionSeqSeqLong" idltype="_2_anonException" />
-                      <corba:member name="exceptionSeqSeqSeqLong" idltype="_3_anonException" />
-                    </corba:exception>
-                      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:float" bound="0" name="anonSequences._1_myFloatSeqSeq" type="ns4:anonSequences._1_myFloatSeqSeq" />
-                      <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myFloatSeqSeq" bound="0" repositoryID="IDL:anonSequences/myFloatSeqSeq:1.0" name="anonSequences.myFloatSeqSeq" type="ns4:anonSequences.myFloatSeqSeq" />
-                      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:double" bound="0" name="anonSequences._1_myDoubleSeqSeq" type="ns4:anonSequences._1_myDoubleSeqSeq" />
-                      <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myDoubleSeqSeq" bound="0" repositoryID="IDL:anonSequences/myDoubleSeqSeq:1.0" name="anonSequences.myDoubleSeqSeq" type="ns4:anonSequences.myDoubleSeqSeq" />
-                      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:longdouble" bound="0" name="anonSequences._1_myLongDoubleSeqSeq" type="ns4:anonSequences._1_myLongDoubleSeqSeq" />
-                      <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myLongDoubleSeqSeq" bound="0" repositoryID="IDL:anonSequences/myLongDoubleSeqSeq:1.0" name="anonSequences.myLongDoubleSeqSeq" type="ns4:anonSequences.myLongDoubleSeqSeq" />
-                      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:short" bound="0" name="anonSequences._1_myShortSeqSeq" type="ns4:anonSequences._1_myShortSeqSeq" />
-                      <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myShortSeqSeq" bound="0" repositoryID="IDL:anonSequences/myShortSeqSeq:1.0" name="anonSequences.myShortSeqSeq" type="ns4:anonSequences.myShortSeqSeq" />
-                      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="anonSequences._1_myLongSeqSeq" type="ns4:anonSequences._1_myLongSeqSeq" />
-                      <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myLongSeqSeq" bound="0" repositoryID="IDL:anonSequences/myLongSeqSeq:1.0" name="anonSequences.myLongSeqSeq" type="ns4:anonSequences.myLongSeqSeq" />
-                      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:longlong" bound="0" name="anonSequences._1_myLonglongSeqSeq" type="ns4:anonSequences._1_myLonglongSeqSeq" />
-                      <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myLonglongSeqSeq" bound="0" repositoryID="IDL:anonSequences/myLonglongSeqSeq:1.0" name="anonSequences.myLonglongSeqSeq" type="ns4:anonSequences.myLonglongSeqSeq" />
-                      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:ushort" bound="0" name="anonSequences._1_myUnsignedShortSeqSeq" type="ns4:anonSequences._1_myUnsignedShortSeqSeq" />
-                      <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myUnsignedShortSeqSeq" bound="0" repositoryID="IDL:anonSequences/myUnsignedShortSeqSeq:1.0" name="anonSequences.myUnsignedShortSeqSeq" type="ns4:anonSequences.myUnsignedShortSeqSeq" />
-                      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:ulong" bound="0" name="anonSequences._1_myUnsignedLongSeqSeq" type="ns4:anonSequences._1_myUnsignedLongSeqSeq" />
-                      <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myUnsignedLongSeqSeq" bound="0" repositoryID="IDL:anonSequences/myUnsignedLongSeqSeq:1.0" name="anonSequences.myUnsignedLongSeqSeq" type="ns4:anonSequences.myUnsignedLongSeqSeq" />
-                      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:ulonglong" bound="0" name="anonSequences._1_myUnsignedLongLongSeqSeq" type="ns4:anonSequences._1_myUnsignedLongLongSeqSeq" />
-                      <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myUnsignedLongLongSeqSeq" bound="0" repositoryID="IDL:anonSequences/myUnsignedLongLongSeqSeq:1.0" name="anonSequences.myUnsignedLongLongSeqSeq" type="ns4:anonSequences.myUnsignedLongLongSeqSeq" />
-                      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:char" bound="0" name="anonSequences._1_myCharSeqSeq" type="ns4:anonSequences._1_myCharSeqSeq" />
-                      <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myCharSeqSeq" bound="0" repositoryID="IDL:anonSequences/myCharSeqSeq:1.0" name="anonSequences.myCharSeqSeq" type="ns4:anonSequences.myCharSeqSeq" />
-                      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:wchar" bound="0" name="anonSequences._1_myWcharSeqSeq" type="ns4:anonSequences._1_myWcharSeqSeq" />
-                      <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myWcharSeqSeq" bound="0" repositoryID="IDL:anonSequences/myWcharSeqSeq:1.0" name="anonSequences.myWcharSeqSeq" type="ns4:anonSequences.myWcharSeqSeq" />
-                      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:boolean" bound="0" name="anonSequences._1_myBooleanSeqSeq" type="ns4:anonSequences._1_myBooleanSeqSeq" />
-                      <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myBooleanSeqSeq" bound="0" repositoryID="IDL:anonSequences/myBooleanSeqSeq:1.0" name="anonSequences.myBooleanSeqSeq" type="ns4:anonSequences.myBooleanSeqSeq" />
-                      <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:octet" bound="0" name="anonSequences._1_myOctetSeqSeq" type="ns4:anonSequences._1_myOctetSeqSeq" />
-                      <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myOctetSeqSeq" bound="0" repositoryID="IDL:anonSequences/myOctetSeqSeq:1.0" name="anonSequences.myOctetSeqSeq" type="ns4:anonSequences.myOctetSeqSeq" />
-                    </corba:typeMapping>
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:short" bound="0" name="_1_anonTypedefStruct" type="ns4:_1_anonTypedefStruct" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:short" bound="0" name="anonTypedefStruct._1_anonTypedefStruct" type="ns4:anonTypedefStruct._1_anonTypedefStruct" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonTypedefStruct._1_anonTypedefStruct" bound="0" name="_2_anonTypedefStruct" type="ns4:_2_anonTypedefStruct" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:short" bound="0" name="anonTypedefStruct._2_anonTypedefStruct" type="ns4:anonTypedefStruct._2_anonTypedefStruct" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonTypedefStruct._2_anonTypedefStruct" bound="0" name="anonTypedefStruct._3_anonTypedefStruct" type="ns4:anonTypedefStruct._3_anonTypedefStruct" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonTypedefStruct._3_anonTypedefStruct" bound="0" name="_3_anonTypedefStruct" type="ns4:_3_anonTypedefStruct" />
+    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" repositoryID="IDL:anonTypedefStruct:1.0" name="anonTypedefStruct" type="ns4:anonTypedefStruct">
+      <corba:member name="typedefStructSeqShort" idltype="_1_anonTypedefStruct" />
+      <corba:member name="typedefStructSeqSeqShort" idltype="_2_anonTypedefStruct" />
+      <corba:member name="typedefStructSeqSeqSeqShort" idltype="_3_anonTypedefStruct" />
+    </corba:struct>
+    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" basetype="anonTypedefStruct" repositoryID="IDL:myAnonTypedefStruct:1.0" name="myAnonTypedefStruct" type="ns4:anonTypedefStruct" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="_1_anonUnion" type="ns4:_1_anonUnion" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="anonUnion._1_anonUnion" type="ns4:anonUnion._1_anonUnion" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonUnion._1_anonUnion" bound="0" name="_2_anonUnion" type="ns4:_2_anonUnion" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="anonUnion._2_anonUnion" type="ns4:anonUnion._2_anonUnion" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonUnion._2_anonUnion" bound="0" name="anonUnion._3_anonUnion" type="ns4:anonUnion._3_anonUnion" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonUnion._3_anonUnion" bound="0" name="_3_anonUnion" type="ns4:_3_anonUnion" />
+    <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" discriminator="corba:long" repositoryID="IDL:anonUnion:1.0" name="anonUnion" type="ns4:anonUnion">
+      <corba:unionbranch name="unionSeqLong" idltype="_1_anonUnion">
+        <corba:case label="1" />
+      </corba:unionbranch>
+      <corba:unionbranch name="unionSeqSeqLong" idltype="_2_anonUnion">
+        <corba:case label="2" />
+      </corba:unionbranch>
+      <corba:unionbranch name="unionSeqSeqSeqLong" idltype="_3_anonUnion" default="true" />
+    </corba:union>
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="_1_anonTypedefUnion" type="ns4:_1_anonTypedefUnion" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="anonTypedefUnion._1_anonTypedefUnion" type="ns4:anonTypedefUnion._1_anonTypedefUnion" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonTypedefUnion._1_anonTypedefUnion" bound="0" name="_2_anonTypedefUnion" type="ns4:_2_anonTypedefUnion" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="anonTypedefUnion._2_anonTypedefUnion" type="ns4:anonTypedefUnion._2_anonTypedefUnion" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonTypedefUnion._2_anonTypedefUnion" bound="0" name="anonTypedefUnion._3_anonTypedefUnion" type="ns4:anonTypedefUnion._3_anonTypedefUnion" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonTypedefUnion._3_anonTypedefUnion" bound="0" name="_3_anonTypedefUnion" type="ns4:_3_anonTypedefUnion" />
+    <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" discriminator="corba:long" repositoryID="IDL:anonTypedefUnion:1.0" name="anonTypedefUnion" type="ns4:anonTypedefUnion">
+      <corba:unionbranch name="typedefUnionSeqLong" idltype="_1_anonTypedefUnion">
+        <corba:case label="1" />
+      </corba:unionbranch>
+      <corba:unionbranch name="typedefUnionSeqSeqLong" idltype="_2_anonTypedefUnion">
+        <corba:case label="2" />
+      </corba:unionbranch>
+      <corba:unionbranch name="typedefUnionSeqSeqSeqLong" idltype="_3_anonTypedefUnion" default="true" />
+    </corba:union>
+    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" basetype="anonTypedefUnion" repositoryID="IDL:myAnonUnion:1.0" name="myAnonUnion" type="ns4:anonTypedefUnion" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="_1_anonException" type="ns4:_1_anonException" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="anonException._1_anonException" type="ns4:anonException._1_anonException" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonException._1_anonException" bound="0" name="_2_anonException" type="ns4:_2_anonException" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="anonException._2_anonException" type="ns4:anonException._2_anonException" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonException._2_anonException" bound="0" name="anonException._3_anonException" type="ns4:anonException._3_anonException" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonException._3_anonException" bound="0" name="_3_anonException" type="ns4:_3_anonException" />
+    <corba:exception xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" repositoryID="IDL:anonException:1.0" name="anonException" type="ns4:anonExceptionType">
+      <corba:member name="exceptionSeqLong" idltype="_1_anonException" />
+      <corba:member name="exceptionSeqSeqLong" idltype="_2_anonException" />
+      <corba:member name="exceptionSeqSeqSeqLong" idltype="_3_anonException" />
+    </corba:exception>
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:float" bound="0" name="anonSequences._1_myFloatSeqSeq" type="ns4:anonSequences._1_myFloatSeqSeq" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myFloatSeqSeq" bound="0" repositoryID="IDL:anonSequences/myFloatSeqSeq:1.0" name="anonSequences.myFloatSeqSeq" type="ns4:anonSequences.myFloatSeqSeq" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:double" bound="0" name="anonSequences._1_myDoubleSeqSeq" type="ns4:anonSequences._1_myDoubleSeqSeq" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myDoubleSeqSeq" bound="0" repositoryID="IDL:anonSequences/myDoubleSeqSeq:1.0" name="anonSequences.myDoubleSeqSeq" type="ns4:anonSequences.myDoubleSeqSeq" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:longdouble" bound="0" name="anonSequences._1_myLongDoubleSeqSeq" type="ns4:anonSequences._1_myLongDoubleSeqSeq" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myLongDoubleSeqSeq" bound="0" repositoryID="IDL:anonSequences/myLongDoubleSeqSeq:1.0" name="anonSequences.myLongDoubleSeqSeq" type="ns4:anonSequences.myLongDoubleSeqSeq" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:short" bound="0" name="anonSequences._1_myShortSeqSeq" type="ns4:anonSequences._1_myShortSeqSeq" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myShortSeqSeq" bound="0" repositoryID="IDL:anonSequences/myShortSeqSeq:1.0" name="anonSequences.myShortSeqSeq" type="ns4:anonSequences.myShortSeqSeq" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:long" bound="0" name="anonSequences._1_myLongSeqSeq" type="ns4:anonSequences._1_myLongSeqSeq" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myLongSeqSeq" bound="0" repositoryID="IDL:anonSequences/myLongSeqSeq:1.0" name="anonSequences.myLongSeqSeq" type="ns4:anonSequences.myLongSeqSeq" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:longlong" bound="0" name="anonSequences._1_myLonglongSeqSeq" type="ns4:anonSequences._1_myLonglongSeqSeq" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myLonglongSeqSeq" bound="0" repositoryID="IDL:anonSequences/myLonglongSeqSeq:1.0" name="anonSequences.myLonglongSeqSeq" type="ns4:anonSequences.myLonglongSeqSeq" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:ushort" bound="0" name="anonSequences._1_myUnsignedShortSeqSeq" type="ns4:anonSequences._1_myUnsignedShortSeqSeq" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myUnsignedShortSeqSeq" bound="0" repositoryID="IDL:anonSequences/myUnsignedShortSeqSeq:1.0" name="anonSequences.myUnsignedShortSeqSeq" type="ns4:anonSequences.myUnsignedShortSeqSeq" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:ulong" bound="0" name="anonSequences._1_myUnsignedLongSeqSeq" type="ns4:anonSequences._1_myUnsignedLongSeqSeq" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myUnsignedLongSeqSeq" bound="0" repositoryID="IDL:anonSequences/myUnsignedLongSeqSeq:1.0" name="anonSequences.myUnsignedLongSeqSeq" type="ns4:anonSequences.myUnsignedLongSeqSeq" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:ulonglong" bound="0" name="anonSequences._1_myUnsignedLongLongSeqSeq" type="ns4:anonSequences._1_myUnsignedLongLongSeqSeq" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myUnsignedLongLongSeqSeq" bound="0" repositoryID="IDL:anonSequences/myUnsignedLongLongSeqSeq:1.0" name="anonSequences.myUnsignedLongLongSeqSeq" type="ns4:anonSequences.myUnsignedLongLongSeqSeq" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:char" bound="0" name="anonSequences._1_myCharSeqSeq" type="ns4:anonSequences._1_myCharSeqSeq" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myCharSeqSeq" bound="0" repositoryID="IDL:anonSequences/myCharSeqSeq:1.0" name="anonSequences.myCharSeqSeq" type="ns4:anonSequences.myCharSeqSeq" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:wchar" bound="0" name="anonSequences._1_myWcharSeqSeq" type="ns4:anonSequences._1_myWcharSeqSeq" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myWcharSeqSeq" bound="0" repositoryID="IDL:anonSequences/myWcharSeqSeq:1.0" name="anonSequences.myWcharSeqSeq" type="ns4:anonSequences.myWcharSeqSeq" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:boolean" bound="0" name="anonSequences._1_myBooleanSeqSeq" type="ns4:anonSequences._1_myBooleanSeqSeq" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myBooleanSeqSeq" bound="0" repositoryID="IDL:anonSequences/myBooleanSeqSeq:1.0" name="anonSequences.myBooleanSeqSeq" type="ns4:anonSequences.myBooleanSeqSeq" />
+    <corba:anonsequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="corba:octet" bound="0" name="anonSequences._1_myOctetSeqSeq" type="ns4:anonSequences._1_myOctetSeqSeq" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence/typemap" elemtype="anonSequences._1_myOctetSeqSeq" bound="0" repositoryID="IDL:anonSequences/myOctetSeqSeq:1.0" name="anonSequences.myOctetSeqSeq" type="ns4:anonSequences.myOctetSeqSeq" />
+  </corba:typeMapping>
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns="http://schemas.apache.org/yoko/idl/Anonsequence" xmlns:xs="http://www.w3.org/2001/XMLSchema">
       <xs:complexType name="SeqLong">

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Anonstring.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Anonstring.wsdl?view=diff&rev=495238&r1=495237&r2=495238
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Anonstring.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Anonstring.wsdl Thu Jan 11 06:38:17 2007
@@ -43,41 +43,41 @@
       <corba:member name="anonBoundedString" idltype="AnonStrings._1_anonStringStruct" />
       <corba:member name="anotherAnonBoundedString" idltype="AnonStrings._2_anonStringStruct" />
     </corba:struct>
-      <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" bound="10" name="AnonStrings._1_typedefAnonStringStruct" type="ns4:AnonStrings._1_typedefAnonStringStruct" />
-      <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" bound="20" name="AnonStrings._2_typedefAnonStringStruct" type="ns4:AnonStrings._2_typedefAnonStringStruct" />
-      <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" repositoryID="IDL:AnonStrings/typedefAnonStringStruct:1.0" name="AnonStrings.typedefAnonStringStruct" type="ns4:AnonStrings.typedefAnonStringStruct">
-        <corba:member name="unboundedString" idltype="corba:string" />
-        <corba:member name="anotherUnboundedString" idltype="corba:string" />
-        <corba:member name="anonBoundedString" idltype="AnonStrings._1_typedefAnonStringStruct" />
-        <corba:member name="anotherAnonBoundedString" idltype="AnonStrings._2_typedefAnonStringStruct" />
-      </corba:struct>
-        <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" basetype="AnonStrings.typedefAnonStringStruct" repositoryID="IDL:AnonStrings/myTypedefAnonStringStruct:1.0" name="AnonStrings.myTypedefAnonStringStruct" type="ns4:AnonStrings.typedefAnonStringStruct" />
-        <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" bound="10" name="AnonStrings._1_anonStringUnion" type="ns4:AnonStrings._1_anonStringUnion" />
-        <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" bound="100" name="AnonStrings._2_anonStringUnion" type="ns4:AnonStrings._2_anonStringUnion" />
-        <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" discriminator="corba:long" repositoryID="IDL:AnonStrings/anonStringUnion:1.0" name="AnonStrings.anonStringUnion" type="ns4:AnonStrings.anonStringUnion">
-          <corba:unionbranch name="anonStringUnion1" idltype="AnonStrings._1_anonStringUnion">
-            <corba:case label="1" />
-          </corba:unionbranch>
-            <corba:unionbranch name="anonStringUnionDefault" idltype="AnonStrings._2_anonStringUnion" default="true" />
-          </corba:union>
-            <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" bound="10" name="AnonStrings._1_typedefAnonStringUnion" type="ns4:AnonStrings._1_typedefAnonStringUnion" />
-            <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" bound="100" name="AnonStrings._2_typedefAnonStringUnion" type="ns4:AnonStrings._2_typedefAnonStringUnion" />
-            <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" discriminator="corba:long" repositoryID="IDL:AnonStrings/typedefAnonStringUnion:1.0" name="AnonStrings.typedefAnonStringUnion" type="ns4:AnonStrings.typedefAnonStringUnion">
-              <corba:unionbranch name="anonStringUnion1" idltype="AnonStrings._1_typedefAnonStringUnion">
-                <corba:case label="1" />
-              </corba:unionbranch>
-                <corba:unionbranch name="anonStringUnionDefault" idltype="AnonStrings._2_typedefAnonStringUnion" default="true" />
-              </corba:union>
-                <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" basetype="AnonStrings.typedefAnonStringUnion" repositoryID="IDL:AnonStrings/myTypedefAnonStringUnion:1.0" name="AnonStrings.myTypedefAnonStringUnion" type="ns4:AnonStrings.typedefAnonStringUnion" />
-                <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" bound="10" name="AnonStrings._1_anonException" type="ns4:AnonStrings._1_anonException" />
-                <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" bound="20" name="AnonStrings._2_anonException" type="ns4:AnonStrings._2_anonException" />
-                <corba:exception xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" repositoryID="IDL:AnonStrings/anonException:1.0" name="AnonStrings.anonException" type="ns4:AnonStrings.anonExceptionType">
-                  <corba:member name="unboundedString" idltype="corba:string" />
-                  <corba:member name="anotherUnboundedString" idltype="corba:string" />
-                  <corba:member name="anonBoundedAnonString" idltype="AnonStrings._1_anonException" />
-                  <corba:member name="anotherBoundedAnonString" idltype="AnonStrings._2_anonException" />
-                </corba:exception>
-                </corba:typeMapping>
+    <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" bound="10" name="AnonStrings._1_typedefAnonStringStruct" type="ns4:AnonStrings._1_typedefAnonStringStruct" />
+    <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" bound="20" name="AnonStrings._2_typedefAnonStringStruct" type="ns4:AnonStrings._2_typedefAnonStringStruct" />
+    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" repositoryID="IDL:AnonStrings/typedefAnonStringStruct:1.0" name="AnonStrings.typedefAnonStringStruct" type="ns4:AnonStrings.typedefAnonStringStruct">
+      <corba:member name="unboundedString" idltype="corba:string" />
+      <corba:member name="anotherUnboundedString" idltype="corba:string" />
+      <corba:member name="anonBoundedString" idltype="AnonStrings._1_typedefAnonStringStruct" />
+      <corba:member name="anotherAnonBoundedString" idltype="AnonStrings._2_typedefAnonStringStruct" />
+    </corba:struct>
+    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" basetype="AnonStrings.typedefAnonStringStruct" repositoryID="IDL:AnonStrings/myTypedefAnonStringStruct:1.0" name="AnonStrings.myTypedefAnonStringStruct" type="ns4:AnonStrings.typedefAnonStringStruct" />
+    <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" bound="10" name="AnonStrings._1_anonStringUnion" type="ns4:AnonStrings._1_anonStringUnion" />
+    <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" bound="100" name="AnonStrings._2_anonStringUnion" type="ns4:AnonStrings._2_anonStringUnion" />
+    <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" discriminator="corba:long" repositoryID="IDL:AnonStrings/anonStringUnion:1.0" name="AnonStrings.anonStringUnion" type="ns4:AnonStrings.anonStringUnion">
+      <corba:unionbranch name="anonStringUnion1" idltype="AnonStrings._1_anonStringUnion">
+        <corba:case label="1" />
+      </corba:unionbranch>
+      <corba:unionbranch name="anonStringUnionDefault" idltype="AnonStrings._2_anonStringUnion" default="true" />
+    </corba:union>
+    <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" bound="10" name="AnonStrings._1_typedefAnonStringUnion" type="ns4:AnonStrings._1_typedefAnonStringUnion" />
+    <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" bound="100" name="AnonStrings._2_typedefAnonStringUnion" type="ns4:AnonStrings._2_typedefAnonStringUnion" />
+    <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" discriminator="corba:long" repositoryID="IDL:AnonStrings/typedefAnonStringUnion:1.0" name="AnonStrings.typedefAnonStringUnion" type="ns4:AnonStrings.typedefAnonStringUnion">
+      <corba:unionbranch name="anonStringUnion1" idltype="AnonStrings._1_typedefAnonStringUnion">
+        <corba:case label="1" />
+      </corba:unionbranch>
+      <corba:unionbranch name="anonStringUnionDefault" idltype="AnonStrings._2_typedefAnonStringUnion" default="true" />
+    </corba:union>
+    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" basetype="AnonStrings.typedefAnonStringUnion" repositoryID="IDL:AnonStrings/myTypedefAnonStringUnion:1.0" name="AnonStrings.myTypedefAnonStringUnion" type="ns4:AnonStrings.typedefAnonStringUnion" />
+    <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" bound="10" name="AnonStrings._1_anonException" type="ns4:AnonStrings._1_anonException" />
+    <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" bound="20" name="AnonStrings._2_anonException" type="ns4:AnonStrings._2_anonException" />
+    <corba:exception xmlns:ns4="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring/typemap" repositoryID="IDL:AnonStrings/anonException:1.0" name="AnonStrings.anonException" type="ns4:AnonStrings.anonExceptionType">
+      <corba:member name="unboundedString" idltype="corba:string" />
+      <corba:member name="anotherUnboundedString" idltype="corba:string" />
+      <corba:member name="anonBoundedAnonString" idltype="AnonStrings._1_anonException" />
+      <corba:member name="anotherBoundedAnonString" idltype="AnonStrings._2_anonException" />
+    </corba:exception>
+  </corba:typeMapping>
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/Anonstring" xmlns="http://schemas.apache.org/yoko/idl/Anonstring" xmlns:xs="http://www.w3.org/2001/XMLSchema">
       <xs:simpleType name="AnonStrings._1_String5Array">

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Attributes.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Attributes.wsdl?view=diff&rev=495238&r1=495237&r2=495238
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Attributes.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Attributes.wsdl Thu Jan 11 06:38:17 2007
@@ -23,9 +23,9 @@
       <corba:member name="id" idltype="corba:long" />
       <corba:member name="name" idltype="corba:string" />
     </corba:struct>
-      <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Attributes" xmlns="http://schemas.apache.org/yoko/idl/Attributes/typemap" bound="20" name="If._1_myString" type="ns4:If.myString" />
-      <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Attributes" xmlns="http://schemas.apache.org/yoko/idl/Attributes/typemap" basetype="If._1_myString" repositoryID="IDL:If/myString:1.0" name="If.myString" type="ns4:If.myString" />
-    </corba:typeMapping>
+    <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Attributes" xmlns="http://schemas.apache.org/yoko/idl/Attributes/typemap" bound="20" name="If._1_myString" type="ns4:If.myString" />
+    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Attributes" xmlns="http://schemas.apache.org/yoko/idl/Attributes/typemap" basetype="If._1_myString" repositoryID="IDL:If/myString:1.0" name="If.myString" type="ns4:If.myString" />
+  </corba:typeMapping>
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/Attributes" xmlns="http://schemas.apache.org/yoko/idl/Attributes" xmlns:xs="http://www.w3.org/2001/XMLSchema">
       <xs:complexType name="myStruct">

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=495238&r1=495237&r2=495238
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Declarators.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Declarators.wsdl Thu Jan 11 06:38:17 2007
@@ -75,132 +75,132 @@
       <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: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: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: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: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" />
-              <corba:enumerator value="e1_3" />
-              <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: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:case label="e1_1" />
-                  </corba:unionbranch>
-                    <corba:unionbranch name="u1_2" idltype="corba:string">
-                      <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: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: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" />
-                        <corba:enumerator value="e1_3" />
-                        <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: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:case label="e1_1" />
-                            </corba:unionbranch>
-                              <corba:unionbranch name="u1_2" idltype="corba:string">
-                                <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: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:case label="e1_1" />
-                                  </corba:unionbranch>
-                                    <corba:unionbranch name="u1_2" idltype="corba:string">
-                                      <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: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:case label="e1_1" />
-                                        </corba:unionbranch>
-                                          <corba:unionbranch name="u1_2" idltype="corba:string">
-                                            <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: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: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: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: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:typeMapping>
+    <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: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: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: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: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" />
+      <corba:enumerator value="e1_3" />
+      <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: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:case label="e1_1" />
+      </corba:unionbranch>
+      <corba:unionbranch name="u1_2" idltype="corba:string">
+        <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: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: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" />
+      <corba:enumerator value="e1_3" />
+      <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: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:case label="e1_1" />
+      </corba:unionbranch>
+      <corba:unionbranch name="u1_2" idltype="corba:string">
+        <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: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:case label="e1_1" />
+      </corba:unionbranch>
+      <corba:unionbranch name="u1_2" idltype="corba:string">
+        <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: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:case label="e1_1" />
+      </corba:unionbranch>
+      <corba:unionbranch name="u1_2" idltype="corba:string">
+        <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: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: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: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: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: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">

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=495238&r1=495237&r2=495238
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Enum.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Enum.wsdl Thu Jan 11 06:38:17 2007
@@ -24,22 +24,22 @@
       <corba:enumerator value="e1_2" />
       <corba:enumerator value="e1_3" />
     </corba:enum>
-      <corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Enum" xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" repositoryID="IDL:if1/e_type2:1.0" name="if1.e_type2" type="ns4:if1.e_type2">
-        <corba:enumerator value="e2_1" />
-        <corba:enumerator value="e2_2" />
-        <corba:enumerator value="e2_3" />
-      </corba:enum>
-        <corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Enum" xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" repositoryID="IDL:m1/e_type3:1.0" name="m1.e_type3" type="ns4:m1.e_type3">
-          <corba:enumerator value="e3_1" />
-          <corba:enumerator value="e3_2" />
-          <corba:enumerator value="e3_3" />
-        </corba:enum>
-          <corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Enum" xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" repositoryID="IDL:m1/if3/e_type4:1.0" name="m1.if3.e_type4" type="ns4:m1.if3.e_type4">
-            <corba:enumerator value="e4_1" />
-            <corba:enumerator value="e4_2" />
-            <corba:enumerator value="e4_3" />
-          </corba:enum>
-          </corba:typeMapping>
+    <corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Enum" xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" repositoryID="IDL:if1/e_type2:1.0" name="if1.e_type2" type="ns4:if1.e_type2">
+      <corba:enumerator value="e2_1" />
+      <corba:enumerator value="e2_2" />
+      <corba:enumerator value="e2_3" />
+    </corba:enum>
+    <corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Enum" xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" repositoryID="IDL:m1/e_type3:1.0" name="m1.e_type3" type="ns4:m1.e_type3">
+      <corba:enumerator value="e3_1" />
+      <corba:enumerator value="e3_2" />
+      <corba:enumerator value="e3_3" />
+    </corba:enum>
+    <corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Enum" xmlns="http://schemas.apache.org/yoko/idl/Enum/typemap" repositoryID="IDL:m1/if3/e_type4:1.0" name="m1.if3.e_type4" type="ns4:m1.if3.e_type4">
+      <corba:enumerator value="e4_1" />
+      <corba:enumerator value="e4_2" />
+      <corba:enumerator value="e4_3" />
+    </corba:enum>
+  </corba:typeMapping>
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/Enum" xmlns="http://schemas.apache.org/yoko/idl/Enum" xmlns:xs="http://www.w3.org/2001/XMLSchema">
       <xs:simpleType name="e_type1">



Mime
View raw message