You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by mv...@apache.org on 2006/11/21 11:24:20 UTC

svn commit: r477628 [6/7] - in /incubator/yoko/branches/idltowsdl_anon_refactor/tools/src: main/java/org/apache/yoko/tools/processors/idl/ test/resources/idl/

Modified: incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Sequence.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Sequence.wsdl?view=diff&rev=477628&r1=477627&r2=477628
==============================================================================
--- incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Sequence.wsdl (original)
+++ incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Sequence.wsdl Tue Nov 21 03:24:10 2006
@@ -27,19 +27,19 @@
     <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="boundedLongSequence" bound="0" repositoryID="IDL:boundedLongSequenceSequence:1.0" name="boundedLongSequenceSequence" type="ns4:boundedLongSequenceSequence" />
     <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="longSequence" bound="30" repositoryID="IDL:longSequenceBoundedSequence:1.0" name="longSequenceBoundedSequence" type="ns4:longSequenceBoundedSequence" />
     <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="boundedLongSequence" bound="10" repositoryID="IDL:boundedLongSequenceBoundedSequence:1.0" name="boundedLongSequenceBoundedSequence" type="ns4:boundedLongSequenceBoundedSequence" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:float" bound="0" repositoryID="IDL:myFloat:1.0" name="myFloat" type="ns4:myFloat" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:double" bound="0" repositoryID="IDL:myDouble:1.0" name="myDouble" type="ns4:myDouble" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:longdouble" bound="0" repositoryID="IDL:myLongDouble:1.0" name="myLongDouble" type="ns4:myLongDouble" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:short" bound="0" repositoryID="IDL:myShort:1.0" name="myShort" type="ns4:myShort" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:long" bound="0" repositoryID="IDL:myLong:1.0" name="myLong" type="ns4:myLong" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:longlong" bound="0" repositoryID="IDL:myLonglong:1.0" name="myLonglong" type="ns4:myLonglong" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:ushort" bound="0" repositoryID="IDL:myUnsignedShort:1.0" name="myUnsignedShort" type="ns4:myUnsignedShort" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:ulong" bound="0" repositoryID="IDL:myUnsignedLong:1.0" name="myUnsignedLong" type="ns4:myUnsignedLong" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:ulonglong" bound="0" repositoryID="IDL:myUnsignedLongLong:1.0" name="myUnsignedLongLong" type="ns4:myUnsignedLongLong" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:char" bound="0" repositoryID="IDL:myChar:1.0" name="myChar" type="ns4:myChar" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:wchar" bound="0" repositoryID="IDL:myWchar:1.0" name="myWchar" type="ns4:myWchar" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:boolean" bound="0" repositoryID="IDL:myBoolean:1.0" name="myBoolean" type="ns4:myBoolean" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:octet" bound="0" repositoryID="IDL:myOctet:1.0" name="myOctet" type="ns4:myOctet" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:float" bound="0" repositoryID="IDL:sequences/myFloat:1.0" name="sequences.myFloat" type="ns4:sequences.myFloat" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:double" bound="0" repositoryID="IDL:sequences/myDouble:1.0" name="sequences.myDouble" type="ns4:sequences.myDouble" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:longdouble" bound="0" repositoryID="IDL:sequences/myLongDouble:1.0" name="sequences.myLongDouble" type="ns4:sequences.myLongDouble" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:short" bound="0" repositoryID="IDL:sequences/myShort:1.0" name="sequences.myShort" type="ns4:sequences.myShort" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:long" bound="0" repositoryID="IDL:sequences/myLong:1.0" name="sequences.myLong" type="ns4:sequences.myLong" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:longlong" bound="0" repositoryID="IDL:sequences/myLonglong:1.0" name="sequences.myLonglong" type="ns4:sequences.myLonglong" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:ushort" bound="0" repositoryID="IDL:sequences/myUnsignedShort:1.0" name="sequences.myUnsignedShort" type="ns4:sequences.myUnsignedShort" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:ulong" bound="0" repositoryID="IDL:sequences/myUnsignedLong:1.0" name="sequences.myUnsignedLong" type="ns4:sequences.myUnsignedLong" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:ulonglong" bound="0" repositoryID="IDL:sequences/myUnsignedLongLong:1.0" name="sequences.myUnsignedLongLong" type="ns4:sequences.myUnsignedLongLong" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:char" bound="0" repositoryID="IDL:sequences/myChar:1.0" name="sequences.myChar" type="ns4:sequences.myChar" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:wchar" bound="0" repositoryID="IDL:sequences/myWchar:1.0" name="sequences.myWchar" type="ns4:sequences.myWchar" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:boolean" bound="0" repositoryID="IDL:sequences/myBoolean:1.0" name="sequences.myBoolean" type="ns4:sequences.myBoolean" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" elemtype="corba:octet" bound="0" repositoryID="IDL:sequences/myOctet:1.0" name="sequences.myOctet" type="ns4:sequences.myOctet" />
   </corba:typeMapping>
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence" xmlns:xs="http://www.w3.org/2001/XMLSchema">
@@ -91,79 +91,79 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:complexType name="myFloat">
+      <xs:complexType name="sequences.myFloat">
         <xs:sequence>
           <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="xs:float">
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:complexType name="myDouble">
+      <xs:complexType name="sequences.myDouble">
         <xs:sequence>
           <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="xs:double">
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:complexType name="myLongDouble">
+      <xs:complexType name="sequences.myLongDouble">
         <xs:sequence>
           <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="xs:double">
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:complexType name="myShort">
+      <xs:complexType name="sequences.myShort">
         <xs:sequence>
           <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="xs:short">
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:complexType name="myLong">
+      <xs:complexType name="sequences.myLong">
         <xs:sequence>
           <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="xs:int">
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:complexType name="myLonglong">
+      <xs:complexType name="sequences.myLonglong">
         <xs:sequence>
           <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="xs:long">
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:complexType name="myUnsignedShort">
+      <xs:complexType name="sequences.myUnsignedShort">
         <xs:sequence>
           <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="xs:unsignedShort">
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:complexType name="myUnsignedLong">
+      <xs:complexType name="sequences.myUnsignedLong">
         <xs:sequence>
           <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="xs:unsignedInt">
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:complexType name="myUnsignedLongLong">
+      <xs:complexType name="sequences.myUnsignedLongLong">
         <xs:sequence>
           <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="xs:unsignedLong">
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:complexType name="myChar">
+      <xs:complexType name="sequences.myChar">
         <xs:sequence>
           <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="xs:byte">
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:complexType name="myWchar">
+      <xs:complexType name="sequences.myWchar">
         <xs:sequence>
           <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="xs:string">
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:complexType name="myBoolean">
+      <xs:complexType name="sequences.myBoolean">
         <xs:sequence>
           <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="xs:boolean">
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:complexType name="myOctet">
+      <xs:complexType name="sequences.myOctet">
         <xs:sequence>
           <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="xs:unsignedByte">
           </xs:element>

Modified: incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Struct.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Struct.wsdl?view=diff&rev=477628&r1=477627&r2=477628
==============================================================================
--- incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Struct.wsdl (original)
+++ incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Struct.wsdl Tue Nov 21 03:24:10 2006
@@ -23,23 +23,23 @@
       <corba:member name="number" idltype="corba:long" />
       <corba:member name="word" idltype="corba:string" />
     </corba:struct>
-      <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct" xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" repositoryID="IDL:Employee:1.0" name="Employee" type="ns4:Employee">
+      <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct" xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" repositoryID="IDL:StructTest/Employee:1.0" name="StructTest.Employee" type="ns4:StructTest.Employee">
         <corba:member name="name" idltype="corba:string" />
         <corba:member name="dept" idltype="corba:string" />
       </corba:struct>
-        <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct" xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" repositoryID="IDL:Compensation:1.0" name="Compensation" type="ns4:Compensation">
+        <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct" xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" repositoryID="IDL:StructTest/Compensation:1.0" name="StructTest.Compensation" type="ns4:StructTest.Compensation">
           <corba:member name="amount" idltype="corba:long" />
           <corba:member name="currency" idltype="corba:string" />
           <corba:member name="praise" idltype="corba:string" />
         </corba:struct>
-          <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct" xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" repositoryID="IDL:NestedOutsideStruct:1.0" name="NestedOutsideStruct" type="ns4:NestedOutsideStruct">
+          <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct" xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" repositoryID="IDL:StructTest/NestedOutsideStruct:1.0" name="StructTest.NestedOutsideStruct" type="ns4:StructTest.NestedOutsideStruct">
             <corba:member name="aShort" idltype="corba:short" />
             <corba:member name="aLong" idltype="corba:long" />
             <corba:member name="outsider" idltype="OutsideStruct" />
           </corba:struct>
-            <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct" xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" repositoryID="IDL:NestedStructs:1.0" name="NestedStructs" type="ns4:NestedStructs">
-              <corba:member name="employStruct" idltype="Employee" />
-              <corba:member name="compensationStruct" idltype="Compensation" />
+            <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct" xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" repositoryID="IDL:StructTest/NestedStructs:1.0" name="StructTest.NestedStructs" type="ns4:StructTest.NestedStructs">
+              <corba:member name="employStruct" idltype="StructTest.Employee" />
+              <corba:member name="compensationStruct" idltype="StructTest.Compensation" />
             </corba:struct>
             </corba:typeMapping>
   <wsdl:types>
@@ -52,7 +52,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:complexType name="Employee">
+      <xs:complexType name="StructTest.Employee">
         <xs:sequence>
           <xs:element name="name" type="xs:string">
           </xs:element>
@@ -60,7 +60,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:complexType name="Compensation">
+      <xs:complexType name="StructTest.Compensation">
         <xs:sequence>
           <xs:element name="amount" type="xs:int">
           </xs:element>
@@ -73,7 +73,7 @@
       <xs:element name="congratulate">
         <xs:complexType>
           <xs:sequence>
-            <xs:element name="emp" type="Employee">
+            <xs:element name="emp" type="StructTest.Employee">
             </xs:element>
           </xs:sequence>
         </xs:complexType>
@@ -81,7 +81,7 @@
       <xs:element name="congratulateResponse">
         <xs:complexType>
           <xs:sequence>
-            <xs:element name="reward" type="Compensation">
+            <xs:element name="reward" type="StructTest.Compensation">
             </xs:element>
           </xs:sequence>
         </xs:complexType>
@@ -89,7 +89,7 @@
       <xs:element name="getCompensation">
         <xs:complexType>
           <xs:sequence>
-            <xs:element name="emp2" type="Employee">
+            <xs:element name="emp2" type="StructTest.Employee">
             </xs:element>
           </xs:sequence>
         </xs:complexType>
@@ -97,12 +97,12 @@
       <xs:element name="getCompensationResponse">
         <xs:complexType>
           <xs:sequence>
-            <xs:element name="return" type="Compensation">
+            <xs:element name="return" type="StructTest.Compensation">
             </xs:element>
           </xs:sequence>
         </xs:complexType>
       </xs:element>
-      <xs:complexType name="NestedOutsideStruct">
+      <xs:complexType name="StructTest.NestedOutsideStruct">
         <xs:sequence>
           <xs:element name="aShort" type="xs:short">
           </xs:element>
@@ -112,11 +112,11 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:complexType name="NestedStructs">
+      <xs:complexType name="StructTest.NestedStructs">
         <xs:sequence>
-          <xs:element name="employStruct" type="Employee">
+          <xs:element name="employStruct" type="StructTest.Employee">
           </xs:element>
-          <xs:element name="compensationStruct" type="Compensation">
+          <xs:element name="compensationStruct" type="StructTest.Compensation">
           </xs:element>
         </xs:sequence>
       </xs:complexType>
@@ -148,8 +148,8 @@
     <corba:binding repositoryID="IDL:StructTest:1.0" />
     <wsdl:operation name="congratulate">
       <corba:operation name="congratulate">
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" mode="in" name="emp" idltype="Employee" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" mode="out" name="reward" idltype="Compensation" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" mode="in" name="emp" idltype="StructTest.Employee" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" mode="out" name="reward" idltype="StructTest.Compensation" />
       </corba:operation>
       <wsdl:input name="congratulateRequest">
       </wsdl:input>
@@ -158,8 +158,8 @@
     </wsdl:operation>
     <wsdl:operation name="getCompensation">
       <corba:operation name="getCompensation">
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" mode="in" name="emp2" idltype="Employee" />
-        <corba:return xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" name="return" idltype="Compensation" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" mode="in" name="emp2" idltype="StructTest.Employee" />
+        <corba:return xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" name="return" idltype="StructTest.Compensation" />
       </corba:operation>
       <wsdl:input name="getCompensationRequest">
       </wsdl:input>

Modified: incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Typedef.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Typedef.wsdl?view=diff&rev=477628&r1=477627&r2=477628
==============================================================================
--- incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Typedef.wsdl (original)
+++ incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/test/resources/idl/expected_Typedef.wsdl Tue Nov 21 03:24:10 2006
@@ -19,127 +19,127 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/Typedef" xmlns:tns="http://schemas.apache.org/yoko/idl/Typedef" 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/Typedef/typemap">
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:float" repositoryID="IDL:myFloat:1.0" name="myFloat" type="xs:float" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:double" repositoryID="IDL:myDouble:1.0" name="myDouble" type="xs:double" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:longdouble" repositoryID="IDL:myLongDouble:1.0" name="myLongDouble" type="xs:double" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:short" repositoryID="IDL:myShort:1.0" name="myShort" type="xs:short" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:long" repositoryID="IDL:myLong:1.0" name="myLong" type="xs:int" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:longlong" repositoryID="IDL:myLongLong:1.0" name="myLongLong" type="xs:long" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:ushort" repositoryID="IDL:myUnsignedShort:1.0" name="myUnsignedShort" type="xs:unsignedShort" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:ulong" repositoryID="IDL:myUnsignedLong:1.0" name="myUnsignedLong" type="xs:unsignedInt" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:ulonglong" repositoryID="IDL:myUnsignedLongLong:1.0" name="myUnsignedLongLong" type="xs:unsignedLong" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:char" repositoryID="IDL:myChar:1.0" name="myChar" type="xs:byte" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:wchar" repositoryID="IDL:myWChar:1.0" name="myWChar" type="xs:string" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:boolean" repositoryID="IDL:myBoolean:1.0" name="myBoolean" type="xs:boolean" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:octet" repositoryID="IDL:myOctet:1.0" name="myOctet" type="xs:unsignedByte" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" elemtype="corba:long" bound="0" repositoryID="IDL:SeqLong:1.0" name="SeqLong" type="ns4:SeqLong" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:string" repositoryID="IDL:aString:1.0" name="aString" type="xs:string" />
-    <corba:fixed xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" scale="2" digits="5" repositoryID="IDL:Fixed52:1.0" name="Fixed52" type="ns4:Fixed52" />
-    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="SeqLong" repositoryID="IDL:mySeqLong:1.0" name="mySeqLong" type="ns4:SeqLong" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:string" repositoryID="IDL:myString:1.0" name="myString" type="xs:string" />
-    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="Fixed52" repositoryID="IDL:myFixed52:1.0" name="myFixed52" type="ns4:Fixed52" />
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" repositoryID="IDL:aStruct:1.0" name="aStruct" type="ns4:aStruct">
-      <corba:member name="aStructMyLong" idltype="myLong" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:float" repositoryID="IDL:TypedefIf/myFloat:1.0" name="TypedefIf.myFloat" type="xs:float" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:double" repositoryID="IDL:TypedefIf/myDouble:1.0" name="TypedefIf.myDouble" type="xs:double" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:longdouble" repositoryID="IDL:TypedefIf/myLongDouble:1.0" name="TypedefIf.myLongDouble" type="xs:double" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:short" repositoryID="IDL:TypedefIf/myShort:1.0" name="TypedefIf.myShort" type="xs:short" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:long" repositoryID="IDL:TypedefIf/myLong:1.0" name="TypedefIf.myLong" type="xs:int" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:longlong" repositoryID="IDL:TypedefIf/myLongLong:1.0" name="TypedefIf.myLongLong" type="xs:long" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:ushort" repositoryID="IDL:TypedefIf/myUnsignedShort:1.0" name="TypedefIf.myUnsignedShort" type="xs:unsignedShort" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:ulong" repositoryID="IDL:TypedefIf/myUnsignedLong:1.0" name="TypedefIf.myUnsignedLong" type="xs:unsignedInt" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:ulonglong" repositoryID="IDL:TypedefIf/myUnsignedLongLong:1.0" name="TypedefIf.myUnsignedLongLong" type="xs:unsignedLong" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:char" repositoryID="IDL:TypedefIf/myChar:1.0" name="TypedefIf.myChar" type="xs:byte" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:wchar" repositoryID="IDL:TypedefIf/myWChar:1.0" name="TypedefIf.myWChar" type="xs:string" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:boolean" repositoryID="IDL:TypedefIf/myBoolean:1.0" name="TypedefIf.myBoolean" type="xs:boolean" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:octet" repositoryID="IDL:TypedefIf/myOctet:1.0" name="TypedefIf.myOctet" type="xs:unsignedByte" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" elemtype="corba:long" bound="0" repositoryID="IDL:TypedefIf/SeqLong:1.0" name="TypedefIf.SeqLong" type="ns4:TypedefIf.SeqLong" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:string" repositoryID="IDL:TypedefIf/aString:1.0" name="TypedefIf.aString" type="xs:string" />
+    <corba:fixed xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" scale="2" digits="5" repositoryID="IDL:TypedefIf/Fixed52:1.0" name="TypedefIf.Fixed52" type="ns4:TypedefIf.Fixed52" />
+    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.SeqLong" repositoryID="IDL:TypedefIf/mySeqLong:1.0" name="TypedefIf.mySeqLong" type="ns4:TypedefIf.SeqLong" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:string" repositoryID="IDL:TypedefIf/myString:1.0" name="TypedefIf.myString" type="xs:string" />
+    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.Fixed52" repositoryID="IDL:TypedefIf/myFixed52:1.0" name="TypedefIf.myFixed52" type="ns4:TypedefIf.Fixed52" />
+    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" repositoryID="IDL:TypedefIf/aStruct:1.0" name="TypedefIf.aStruct" type="ns4:TypedefIf.aStruct">
+      <corba:member name="aStructMyLong" idltype="TypedefIf.myLong" />
       <corba:member name="aLong" idltype="corba:long" />
     </corba:struct>
-      <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="aStruct" repositoryID="IDL:myStruct:1.0" name="myStruct" type="ns4:aStruct" />
-      <corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" repositoryID="IDL:aEnum:1.0" name="aEnum" type="ns4:aEnum">
+      <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.aStruct" repositoryID="IDL:TypedefIf/myStruct:1.0" name="TypedefIf.myStruct" type="ns4:TypedefIf.aStruct" />
+      <corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" repositoryID="IDL:TypedefIf/aEnum:1.0" name="TypedefIf.aEnum" type="ns4:TypedefIf.aEnum">
         <corba:enumerator value="aEnum1" />
         <corba:enumerator value="aEnum2" />
       </corba:enum>
-        <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="aEnum" repositoryID="IDL:myEnum:1.0" name="myEnum" type="ns4:aEnum" />
-        <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" discriminator="myEnum" repositoryID="IDL:aUnion:1.0" name="aUnion" type="ns4:aUnion">
-          <corba:unionbranch name="aUnionMyLong" idltype="myLong">
+        <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.aEnum" repositoryID="IDL:TypedefIf/myEnum:1.0" name="TypedefIf.myEnum" type="ns4:TypedefIf.aEnum" />
+        <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" discriminator="TypedefIf.myEnum" repositoryID="IDL:TypedefIf/aUnion:1.0" name="TypedefIf.aUnion" type="ns4:TypedefIf.aUnion">
+          <corba:unionbranch name="aUnionMyLong" idltype="TypedefIf.myLong">
             <corba:case label="aEnum1" />
           </corba:unionbranch>
             <corba:unionbranch name="aUnionLong" idltype="corba:long">
               <corba:case label="aEnum2" />
             </corba:unionbranch>
-              <corba:unionbranch name="aUnionMyBoolean" idltype="myBoolean" default="true" />
+              <corba:unionbranch name="aUnionMyBoolean" idltype="TypedefIf.myBoolean" default="true" />
             </corba:union>
-              <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="aUnion" repositoryID="IDL:myUnion:1.0" name="myUnion" type="ns4:aUnion" />
-              <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" repositoryID="IDL:anotherStruct:1.0" name="anotherStruct" type="ns4:anotherStruct">
-                <corba:member name="myOtherLong" idltype="myLong" />
+              <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.aUnion" repositoryID="IDL:TypedefIf/myUnion:1.0" name="TypedefIf.myUnion" type="ns4:TypedefIf.aUnion" />
+              <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" repositoryID="IDL:TypedefIf/anotherStruct:1.0" name="TypedefIf.anotherStruct" type="ns4:TypedefIf.anotherStruct">
+                <corba:member name="myOtherLong" idltype="TypedefIf.myLong" />
                 <corba:member name="anotherLong" idltype="corba:long" />
               </corba:struct>
-                <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="anotherStruct" repositoryID="IDL:myOtherStruct:1.0" name="myOtherStruct" type="ns4:anotherStruct" />
-                <corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" repositoryID="IDL:anotherEnum:1.0" name="anotherEnum" type="ns4:anotherEnum">
+                <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.anotherStruct" repositoryID="IDL:TypedefIf/myOtherStruct:1.0" name="TypedefIf.myOtherStruct" type="ns4:TypedefIf.anotherStruct" />
+                <corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" repositoryID="IDL:TypedefIf/anotherEnum:1.0" name="TypedefIf.anotherEnum" type="ns4:TypedefIf.anotherEnum">
                   <corba:enumerator value="anotherEnum1" />
                   <corba:enumerator value="anotherEnum2" />
                 </corba:enum>
-                  <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="anotherEnum" repositoryID="IDL:myOtherEnum:1.0" name="myOtherEnum" type="ns4:anotherEnum" />
-                  <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" discriminator="myOtherEnum" repositoryID="IDL:anotherUnion:1.0" name="anotherUnion" type="ns4:anotherUnion">
-                    <corba:unionbranch name="anotherUnionMyLong" idltype="myLong">
+                  <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.anotherEnum" repositoryID="IDL:TypedefIf/myOtherEnum:1.0" name="TypedefIf.myOtherEnum" type="ns4:TypedefIf.anotherEnum" />
+                  <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" discriminator="TypedefIf.myOtherEnum" repositoryID="IDL:TypedefIf/anotherUnion:1.0" name="TypedefIf.anotherUnion" type="ns4:TypedefIf.anotherUnion">
+                    <corba:unionbranch name="anotherUnionMyLong" idltype="TypedefIf.myLong">
                       <corba:case label="anotherEnum1" />
                     </corba:unionbranch>
                       <corba:unionbranch name="anotherUnionLong" idltype="corba:long">
                         <corba:case label="anotherEnum2" />
                       </corba:unionbranch>
-                        <corba:unionbranch name="anotherUnionMyBoolean" idltype="myBoolean" default="true" />
+                        <corba:unionbranch name="anotherUnionMyBoolean" idltype="TypedefIf.myBoolean" default="true" />
                       </corba:union>
-                        <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="anotherUnion" repositoryID="IDL:myOtherUnion:1.0" name="myOtherUnion" type="ns4:anotherUnion" />
+                        <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.anotherUnion" repositoryID="IDL:TypedefIf/myOtherUnion:1.0" name="TypedefIf.myOtherUnion" type="ns4:TypedefIf.anotherUnion" />
                       </corba:typeMapping>
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:simpleType name="myFloat">
+      <xs:simpleType name="TypedefIf.myFloat">
         <xs:restriction base="xs:float">
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="myDouble">
+      <xs:simpleType name="TypedefIf.myDouble">
         <xs:restriction base="xs:double">
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="myLongDouble">
+      <xs:simpleType name="TypedefIf.myLongDouble">
         <xs:restriction base="xs:double">
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="myShort">
+      <xs:simpleType name="TypedefIf.myShort">
         <xs:restriction base="xs:short">
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="myLong">
+      <xs:simpleType name="TypedefIf.myLong">
         <xs:restriction base="xs:int">
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="myLongLong">
+      <xs:simpleType name="TypedefIf.myLongLong">
         <xs:restriction base="xs:long">
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="myUnsignedShort">
+      <xs:simpleType name="TypedefIf.myUnsignedShort">
         <xs:restriction base="xs:unsignedShort">
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="myUnsignedLong">
+      <xs:simpleType name="TypedefIf.myUnsignedLong">
         <xs:restriction base="xs:unsignedInt">
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="myUnsignedLongLong">
+      <xs:simpleType name="TypedefIf.myUnsignedLongLong">
         <xs:restriction base="xs:unsignedLong">
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="myChar">
+      <xs:simpleType name="TypedefIf.myChar">
         <xs:restriction base="xs:byte">
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="myWChar">
+      <xs:simpleType name="TypedefIf.myWChar">
         <xs:restriction base="xs:string">
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="myBoolean">
+      <xs:simpleType name="TypedefIf.myBoolean">
         <xs:restriction base="xs:boolean">
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="myOctet">
+      <xs:simpleType name="TypedefIf.myOctet">
         <xs:restriction base="xs:unsignedByte">
         </xs:restriction>
       </xs:simpleType>
-      <xs:complexType name="SeqLong">
+      <xs:complexType name="TypedefIf.SeqLong">
         <xs:sequence>
           <xs:element maxOccurs="unbounded" minOccurs="0" name="item" type="xs:int">
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:simpleType name="Fixed52">
+      <xs:simpleType name="TypedefIf.Fixed52">
         <xs:restriction base="xs:decimal">
           <xs:totalDigits value="5">
           </xs:totalDigits>
@@ -147,31 +147,31 @@
           </xs:fractionDigits>
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="mySeqLong">
-        <xs:restriction base="SeqLong">
+      <xs:simpleType name="TypedefIf.mySeqLong">
+        <xs:restriction base="TypedefIf.SeqLong">
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="myString">
+      <xs:simpleType name="TypedefIf.myString">
         <xs:restriction base="xs:string">
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="myFixed52">
-        <xs:restriction base="Fixed52">
+      <xs:simpleType name="TypedefIf.myFixed52">
+        <xs:restriction base="TypedefIf.Fixed52">
         </xs:restriction>
       </xs:simpleType>
-      <xs:complexType name="aStruct">
+      <xs:complexType name="TypedefIf.aStruct">
         <xs:sequence>
-          <xs:element name="aStructMyLong" type="myLong">
+          <xs:element name="aStructMyLong" type="TypedefIf.myLong">
           </xs:element>
           <xs:element name="aLong" type="xs:int">
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:simpleType name="myStruct">
-        <xs:restriction base="aStruct">
+      <xs:simpleType name="TypedefIf.myStruct">
+        <xs:restriction base="TypedefIf.aStruct">
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="aEnum">
+      <xs:simpleType name="TypedefIf.aEnum">
         <xs:restriction base="xs:string">
           <xs:enumeration value="aEnum1">
           </xs:enumeration>
@@ -179,41 +179,41 @@
           </xs:enumeration>
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="myEnum">
-        <xs:restriction base="aEnum">
+      <xs:simpleType name="TypedefIf.myEnum">
+        <xs:restriction base="TypedefIf.aEnum">
         </xs:restriction>
       </xs:simpleType>
-      <xs:complexType name="aUnion">
+      <xs:complexType name="TypedefIf.aUnion">
         <xs:sequence>
-          <xs:element name="discriminator" type="myEnum">
+          <xs:element name="discriminator" type="TypedefIf.myEnum">
           </xs:element>
           <xs:choice>
-            <xs:element name="aUnionMyLong" type="myLong">
+            <xs:element name="aUnionMyLong" type="TypedefIf.myLong">
             </xs:element>
             <xs:element name="aUnionLong" type="xs:int">
             </xs:element>
-            <xs:element name="aUnionMyBoolean" type="myBoolean">
+            <xs:element name="aUnionMyBoolean" type="TypedefIf.myBoolean">
             </xs:element>
           </xs:choice>
         </xs:sequence>
       </xs:complexType>
-      <xs:simpleType name="myUnion">
-        <xs:restriction base="aUnion">
+      <xs:simpleType name="TypedefIf.myUnion">
+        <xs:restriction base="TypedefIf.aUnion">
         </xs:restriction>
       </xs:simpleType>
-      <xs:complexType name="anotherStruct">
+      <xs:complexType name="TypedefIf.anotherStruct">
         <xs:sequence>
-          <xs:element name="myOtherLong" type="myLong">
+          <xs:element name="myOtherLong" type="TypedefIf.myLong">
           </xs:element>
           <xs:element name="anotherLong" type="xs:int">
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:simpleType name="myOtherStruct">
-        <xs:restriction base="anotherStruct">
+      <xs:simpleType name="TypedefIf.myOtherStruct">
+        <xs:restriction base="TypedefIf.anotherStruct">
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="anotherEnum">
+      <xs:simpleType name="TypedefIf.anotherEnum">
         <xs:restriction base="xs:string">
           <xs:enumeration value="anotherEnum1">
           </xs:enumeration>
@@ -221,78 +221,78 @@
           </xs:enumeration>
         </xs:restriction>
       </xs:simpleType>
-      <xs:simpleType name="myOtherEnum">
-        <xs:restriction base="anotherEnum">
+      <xs:simpleType name="TypedefIf.myOtherEnum">
+        <xs:restriction base="TypedefIf.anotherEnum">
         </xs:restriction>
       </xs:simpleType>
-      <xs:complexType name="anotherUnion">
+      <xs:complexType name="TypedefIf.anotherUnion">
         <xs:sequence>
-          <xs:element name="discriminator" type="myOtherEnum">
+          <xs:element name="discriminator" type="TypedefIf.myOtherEnum">
           </xs:element>
           <xs:choice>
-            <xs:element name="anotherUnionMyLong" type="myLong">
+            <xs:element name="anotherUnionMyLong" type="TypedefIf.myLong">
             </xs:element>
             <xs:element name="anotherUnionLong" type="xs:int">
             </xs:element>
-            <xs:element name="anotherUnionMyBoolean" type="myBoolean">
+            <xs:element name="anotherUnionMyBoolean" type="TypedefIf.myBoolean">
             </xs:element>
           </xs:choice>
         </xs:sequence>
       </xs:complexType>
-      <xs:simpleType name="myOtherUnion">
-        <xs:restriction base="anotherUnion">
+      <xs:simpleType name="TypedefIf.myOtherUnion">
+        <xs:restriction base="TypedefIf.anotherUnion">
         </xs:restriction>
       </xs:simpleType>
       <xs:element name="opIn">
         <xs:complexType>
           <xs:sequence>
-            <xs:element name="inMyFloat" type="myFloat">
+            <xs:element name="inMyFloat" type="TypedefIf.myFloat">
             </xs:element>
-            <xs:element name="inMyDouble" type="myDouble">
+            <xs:element name="inMyDouble" type="TypedefIf.myDouble">
             </xs:element>
-            <xs:element name="inMyFloat" type="myFloat">
+            <xs:element name="inMyFloat" type="TypedefIf.myFloat">
             </xs:element>
-            <xs:element name="inMyDouble" type="myDouble">
+            <xs:element name="inMyDouble" type="TypedefIf.myDouble">
             </xs:element>
-            <xs:element name="inMyLongDouble" type="myLongDouble">
+            <xs:element name="inMyLongDouble" type="TypedefIf.myLongDouble">
             </xs:element>
-            <xs:element name="inMyShort" type="myShort">
+            <xs:element name="inMyShort" type="TypedefIf.myShort">
             </xs:element>
-            <xs:element name="inMyLong" type="myLong">
+            <xs:element name="inMyLong" type="TypedefIf.myLong">
             </xs:element>
-            <xs:element name="inMyLongLong" type="myLongLong">
+            <xs:element name="inMyLongLong" type="TypedefIf.myLongLong">
             </xs:element>
-            <xs:element name="inMyUnsignedShort" type="myUnsignedShort">
+            <xs:element name="inMyUnsignedShort" type="TypedefIf.myUnsignedShort">
             </xs:element>
-            <xs:element name="inMyUnsignedLong" type="myUnsignedLong">
+            <xs:element name="inMyUnsignedLong" type="TypedefIf.myUnsignedLong">
             </xs:element>
-            <xs:element name="inMyUnsignedLongLong" type="myUnsignedLongLong">
+            <xs:element name="inMyUnsignedLongLong" type="TypedefIf.myUnsignedLongLong">
             </xs:element>
-            <xs:element name="inMyChar" type="myChar">
+            <xs:element name="inMyChar" type="TypedefIf.myChar">
             </xs:element>
-            <xs:element name="inMyWChar" type="myWChar">
+            <xs:element name="inMyWChar" type="TypedefIf.myWChar">
             </xs:element>
-            <xs:element name="inMyBoolean" type="myBoolean">
+            <xs:element name="inMyBoolean" type="TypedefIf.myBoolean">
             </xs:element>
-            <xs:element name="inMyOctet" type="myOctet">
+            <xs:element name="inMyOctet" type="TypedefIf.myOctet">
             </xs:element>
-            <xs:element name="inMySeqLong" type="mySeqLong">
+            <xs:element name="inMySeqLong" type="TypedefIf.mySeqLong">
             </xs:element>
-            <xs:element name="inMyString" type="myString">
+            <xs:element name="inMyString" type="TypedefIf.myString">
             </xs:element>
-            <xs:element name="inMyFixed52" type="myFixed52">
+            <xs:element name="inMyFixed52" type="TypedefIf.myFixed52">
             </xs:element>
-            <xs:element name="inMyStruct" type="myStruct">
+            <xs:element name="inMyStruct" type="TypedefIf.myStruct">
             </xs:element>
-            <xs:element name="inMyEnum" type="myEnum">
+            <xs:element name="inMyEnum" type="TypedefIf.myEnum">
             </xs:element>
-            <xs:element name="inMyUnion" type="myUnion">
+            <xs:element name="inMyUnion" type="TypedefIf.myUnion">
             </xs:element>
-            <xs:element name="inMyOtherStruct" type="myOtherStruct">
+            <xs:element name="inMyOtherStruct" type="TypedefIf.myOtherStruct">
             </xs:element>
-            <xs:element name="inMyOtherEnum" type="myOtherEnum">
+            <xs:element name="inMyOtherEnum" type="TypedefIf.myOtherEnum">
             </xs:element>
-            <xs:element name="inMyOtherUnion" type="myOtherUnion">
+            <xs:element name="inMyOtherUnion" type="TypedefIf.myOtherUnion">
             </xs:element>
           </xs:sequence>
         </xs:complexType>
@@ -312,53 +312,53 @@
       <xs:element name="opOutResponse">
         <xs:complexType>
           <xs:sequence>
-            <xs:element name="outMyFloat" type="myFloat">
+            <xs:element name="outMyFloat" type="TypedefIf.myFloat">
             </xs:element>
-            <xs:element name="outMyDouble" type="myDouble">
+            <xs:element name="outMyDouble" type="TypedefIf.myDouble">
             </xs:element>
-            <xs:element name="outMyFloat" type="myFloat">
+            <xs:element name="outMyFloat" type="TypedefIf.myFloat">
             </xs:element>
-            <xs:element name="outMyDouble" type="myDouble">
+            <xs:element name="outMyDouble" type="TypedefIf.myDouble">
             </xs:element>
-            <xs:element name="outMyLongDouble" type="myLongDouble">
+            <xs:element name="outMyLongDouble" type="TypedefIf.myLongDouble">
             </xs:element>
-            <xs:element name="outMyShort" type="myShort">
+            <xs:element name="outMyShort" type="TypedefIf.myShort">
             </xs:element>
-            <xs:element name="outMyLong" type="myLong">
+            <xs:element name="outMyLong" type="TypedefIf.myLong">
             </xs:element>
-            <xs:element name="outMyLongLong" type="myLongLong">
+            <xs:element name="outMyLongLong" type="TypedefIf.myLongLong">
             </xs:element>
-            <xs:element name="outMyUnsignedShort" type="myUnsignedShort">
+            <xs:element name="outMyUnsignedShort" type="TypedefIf.myUnsignedShort">
             </xs:element>
-            <xs:element name="outMyUnsignedLong" type="myUnsignedLong">
+            <xs:element name="outMyUnsignedLong" type="TypedefIf.myUnsignedLong">
             </xs:element>
-            <xs:element name="outMyUnsignedLongLong" type="myUnsignedLongLong">
+            <xs:element name="outMyUnsignedLongLong" type="TypedefIf.myUnsignedLongLong">
             </xs:element>
-            <xs:element name="outMyChar" type="myChar">
+            <xs:element name="outMyChar" type="TypedefIf.myChar">
             </xs:element>
-            <xs:element name="outMyWChar" type="myWChar">
+            <xs:element name="outMyWChar" type="TypedefIf.myWChar">
             </xs:element>
-            <xs:element name="outMyBoolean" type="myBoolean">
+            <xs:element name="outMyBoolean" type="TypedefIf.myBoolean">
             </xs:element>
-            <xs:element name="outMyOctet" type="myOctet">
+            <xs:element name="outMyOctet" type="TypedefIf.myOctet">
             </xs:element>
-            <xs:element name="outMySeqLong" type="mySeqLong">
+            <xs:element name="outMySeqLong" type="TypedefIf.mySeqLong">
             </xs:element>
-            <xs:element name="outMyString" type="myString">
+            <xs:element name="outMyString" type="TypedefIf.myString">
             </xs:element>
-            <xs:element name="outMyFixed52" type="myFixed52">
+            <xs:element name="outMyFixed52" type="TypedefIf.myFixed52">
             </xs:element>
-            <xs:element name="outMyStruct" type="myStruct">
+            <xs:element name="outMyStruct" type="TypedefIf.myStruct">
             </xs:element>
-            <xs:element name="outMyEnum" type="myEnum">
+            <xs:element name="outMyEnum" type="TypedefIf.myEnum">
             </xs:element>
-            <xs:element name="outMyUnion" type="myUnion">
+            <xs:element name="outMyUnion" type="TypedefIf.myUnion">
             </xs:element>
-            <xs:element name="outMyOtherStruct" type="myOtherStruct">
+            <xs:element name="outMyOtherStruct" type="TypedefIf.myOtherStruct">
             </xs:element>
-            <xs:element name="outMyOtherEnum" type="myOtherEnum">
+            <xs:element name="outMyOtherEnum" type="TypedefIf.myOtherEnum">
             </xs:element>
-            <xs:element name="outMyOtherUnion" type="myOtherUnion">
+            <xs:element name="outMyOtherUnion" type="TypedefIf.myOtherUnion">
             </xs:element>
           </xs:sequence>
         </xs:complexType>
@@ -366,53 +366,53 @@
       <xs:element name="opInOut">
         <xs:complexType>
           <xs:sequence>
-            <xs:element name="inoutMyFloat" type="myFloat">
+            <xs:element name="inoutMyFloat" type="TypedefIf.myFloat">
             </xs:element>
-            <xs:element name="inoutMyDouble" type="myDouble">
+            <xs:element name="inoutMyDouble" type="TypedefIf.myDouble">
             </xs:element>
-            <xs:element name="inoutMyFloat" type="myFloat">
+            <xs:element name="inoutMyFloat" type="TypedefIf.myFloat">
             </xs:element>
-            <xs:element name="inoutMyDouble" type="myDouble">
+            <xs:element name="inoutMyDouble" type="TypedefIf.myDouble">
             </xs:element>
-            <xs:element name="inoutMyLongDouble" type="myLongDouble">
+            <xs:element name="inoutMyLongDouble" type="TypedefIf.myLongDouble">
             </xs:element>
-            <xs:element name="inoutMyShort" type="myShort">
+            <xs:element name="inoutMyShort" type="TypedefIf.myShort">
             </xs:element>
-            <xs:element name="inoutMyLong" type="myLong">
+            <xs:element name="inoutMyLong" type="TypedefIf.myLong">
             </xs:element>
-            <xs:element name="inoutMyLongLong" type="myLongLong">
+            <xs:element name="inoutMyLongLong" type="TypedefIf.myLongLong">
             </xs:element>
-            <xs:element name="inoutMyUnsignedShort" type="myUnsignedShort">
+            <xs:element name="inoutMyUnsignedShort" type="TypedefIf.myUnsignedShort">
             </xs:element>
-            <xs:element name="inoutMyUnsignedLong" type="myUnsignedLong">
+            <xs:element name="inoutMyUnsignedLong" type="TypedefIf.myUnsignedLong">
             </xs:element>
-            <xs:element name="inoutMyUnsignedLongLong" type="myUnsignedLongLong">
+            <xs:element name="inoutMyUnsignedLongLong" type="TypedefIf.myUnsignedLongLong">
             </xs:element>
-            <xs:element name="inoutMyChar" type="myChar">
+            <xs:element name="inoutMyChar" type="TypedefIf.myChar">
             </xs:element>
-            <xs:element name="inoutMyWChar" type="myWChar">
+            <xs:element name="inoutMyWChar" type="TypedefIf.myWChar">
             </xs:element>
-            <xs:element name="inoutMyBoolean" type="myBoolean">
+            <xs:element name="inoutMyBoolean" type="TypedefIf.myBoolean">
             </xs:element>
-            <xs:element name="inoutMyOctet" type="myOctet">
+            <xs:element name="inoutMyOctet" type="TypedefIf.myOctet">
             </xs:element>
-            <xs:element name="inoutMySeqLong" type="mySeqLong">
+            <xs:element name="inoutMySeqLong" type="TypedefIf.mySeqLong">
             </xs:element>
-            <xs:element name="inoutMyString" type="myString">
+            <xs:element name="inoutMyString" type="TypedefIf.myString">
             </xs:element>
-            <xs:element name="inoutMyFixed52" type="myFixed52">
+            <xs:element name="inoutMyFixed52" type="TypedefIf.myFixed52">
             </xs:element>
-            <xs:element name="inoutMyStruct" type="myStruct">
+            <xs:element name="inoutMyStruct" type="TypedefIf.myStruct">
             </xs:element>
-            <xs:element name="inoutMyEnum" type="myEnum">
+            <xs:element name="inoutMyEnum" type="TypedefIf.myEnum">
             </xs:element>
-            <xs:element name="inoutMyUnion" type="myUnion">
+            <xs:element name="inoutMyUnion" type="TypedefIf.myUnion">
             </xs:element>
-            <xs:element name="inoutMyOtherStruct" type="myOtherStruct">
+            <xs:element name="inoutMyOtherStruct" type="TypedefIf.myOtherStruct">
             </xs:element>
-            <xs:element name="inoutMyOtherEnum" type="myOtherEnum">
+            <xs:element name="inoutMyOtherEnum" type="TypedefIf.myOtherEnum">
             </xs:element>
-            <xs:element name="inoutMyOtherUnion" type="myOtherUnion">
+            <xs:element name="inoutMyOtherUnion" type="TypedefIf.myOtherUnion">
             </xs:element>
           </xs:sequence>
         </xs:complexType>
@@ -420,53 +420,53 @@
       <xs:element name="opInOutResponse">
         <xs:complexType>
           <xs:sequence>
-            <xs:element name="inoutMyFloat" type="myFloat">
+            <xs:element name="inoutMyFloat" type="TypedefIf.myFloat">
             </xs:element>
-            <xs:element name="inoutMyDouble" type="myDouble">
+            <xs:element name="inoutMyDouble" type="TypedefIf.myDouble">
             </xs:element>
-            <xs:element name="inoutMyFloat" type="myFloat">
+            <xs:element name="inoutMyFloat" type="TypedefIf.myFloat">
             </xs:element>
-            <xs:element name="inoutMyDouble" type="myDouble">
+            <xs:element name="inoutMyDouble" type="TypedefIf.myDouble">
             </xs:element>
-            <xs:element name="inoutMyLongDouble" type="myLongDouble">
+            <xs:element name="inoutMyLongDouble" type="TypedefIf.myLongDouble">
             </xs:element>
-            <xs:element name="inoutMyShort" type="myShort">
+            <xs:element name="inoutMyShort" type="TypedefIf.myShort">
             </xs:element>
-            <xs:element name="inoutMyLong" type="myLong">
+            <xs:element name="inoutMyLong" type="TypedefIf.myLong">
             </xs:element>
-            <xs:element name="inoutMyLongLong" type="myLongLong">
+            <xs:element name="inoutMyLongLong" type="TypedefIf.myLongLong">
             </xs:element>
-            <xs:element name="inoutMyUnsignedShort" type="myUnsignedShort">
+            <xs:element name="inoutMyUnsignedShort" type="TypedefIf.myUnsignedShort">
             </xs:element>
-            <xs:element name="inoutMyUnsignedLong" type="myUnsignedLong">
+            <xs:element name="inoutMyUnsignedLong" type="TypedefIf.myUnsignedLong">
             </xs:element>
-            <xs:element name="inoutMyUnsignedLongLong" type="myUnsignedLongLong">
+            <xs:element name="inoutMyUnsignedLongLong" type="TypedefIf.myUnsignedLongLong">
             </xs:element>
-            <xs:element name="inoutMyChar" type="myChar">
+            <xs:element name="inoutMyChar" type="TypedefIf.myChar">
             </xs:element>
-            <xs:element name="inoutMyWChar" type="myWChar">
+            <xs:element name="inoutMyWChar" type="TypedefIf.myWChar">
             </xs:element>
-            <xs:element name="inoutMyBoolean" type="myBoolean">
+            <xs:element name="inoutMyBoolean" type="TypedefIf.myBoolean">
             </xs:element>
-            <xs:element name="inoutMyOctet" type="myOctet">
+            <xs:element name="inoutMyOctet" type="TypedefIf.myOctet">
             </xs:element>
-            <xs:element name="inoutMySeqLong" type="mySeqLong">
+            <xs:element name="inoutMySeqLong" type="TypedefIf.mySeqLong">
             </xs:element>
-            <xs:element name="inoutMyString" type="myString">
+            <xs:element name="inoutMyString" type="TypedefIf.myString">
             </xs:element>
-            <xs:element name="inoutMyFixed52" type="myFixed52">
+            <xs:element name="inoutMyFixed52" type="TypedefIf.myFixed52">
             </xs:element>
-            <xs:element name="inoutMyStruct" type="myStruct">
+            <xs:element name="inoutMyStruct" type="TypedefIf.myStruct">
             </xs:element>
-            <xs:element name="inoutMyEnum" type="myEnum">
+            <xs:element name="inoutMyEnum" type="TypedefIf.myEnum">
             </xs:element>
-            <xs:element name="inoutMyUnion" type="myUnion">
+            <xs:element name="inoutMyUnion" type="TypedefIf.myUnion">
             </xs:element>
-            <xs:element name="inoutMyOtherStruct" type="myOtherStruct">
+            <xs:element name="inoutMyOtherStruct" type="TypedefIf.myOtherStruct">
             </xs:element>
-            <xs:element name="inoutMyOtherEnum" type="myOtherEnum">
+            <xs:element name="inoutMyOtherEnum" type="TypedefIf.myOtherEnum">
             </xs:element>
-            <xs:element name="inoutMyOtherUnion" type="myOtherUnion">
+            <xs:element name="inoutMyOtherUnion" type="TypedefIf.myOtherUnion">
             </xs:element>
           </xs:sequence>
         </xs:complexType>
@@ -509,30 +509,30 @@
     <corba:binding repositoryID="IDL:TypedefIf:1.0" />
     <wsdl:operation name="opIn">
       <corba:operation name="opIn">
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyFloat" idltype="myFloat" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyDouble" idltype="myDouble" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyFloat" idltype="myFloat" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyDouble" idltype="myDouble" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyLongDouble" idltype="myLongDouble" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyShort" idltype="myShort" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyLong" idltype="myLong" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyLongLong" idltype="myLongLong" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyUnsignedShort" idltype="myUnsignedShort" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyUnsignedLong" idltype="myUnsignedLong" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyUnsignedLongLong" idltype="myUnsignedLongLong" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyChar" idltype="myChar" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyWChar" idltype="myWChar" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyBoolean" idltype="myBoolean" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyOctet" idltype="myOctet" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMySeqLong" idltype="mySeqLong" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyString" idltype="myString" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyFixed52" idltype="myFixed52" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyStruct" idltype="myStruct" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyEnum" idltype="myEnum" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyUnion" idltype="myUnion" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyOtherStruct" idltype="myOtherStruct" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyOtherEnum" idltype="myOtherEnum" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyOtherUnion" idltype="myOtherUnion" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyFloat" idltype="TypedefIf.myFloat" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyDouble" idltype="TypedefIf.myDouble" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyFloat" idltype="TypedefIf.myFloat" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyDouble" idltype="TypedefIf.myDouble" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyLongDouble" idltype="TypedefIf.myLongDouble" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyShort" idltype="TypedefIf.myShort" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyLong" idltype="TypedefIf.myLong" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyLongLong" idltype="TypedefIf.myLongLong" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyUnsignedShort" idltype="TypedefIf.myUnsignedShort" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyUnsignedLong" idltype="TypedefIf.myUnsignedLong" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyUnsignedLongLong" idltype="TypedefIf.myUnsignedLongLong" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyChar" idltype="TypedefIf.myChar" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyWChar" idltype="TypedefIf.myWChar" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyBoolean" idltype="TypedefIf.myBoolean" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyOctet" idltype="TypedefIf.myOctet" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMySeqLong" idltype="TypedefIf.mySeqLong" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyString" idltype="TypedefIf.myString" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyFixed52" idltype="TypedefIf.myFixed52" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyStruct" idltype="TypedefIf.myStruct" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyEnum" idltype="TypedefIf.myEnum" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyUnion" idltype="TypedefIf.myUnion" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyOtherStruct" idltype="TypedefIf.myOtherStruct" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyOtherEnum" idltype="TypedefIf.myOtherEnum" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="in" name="inMyOtherUnion" idltype="TypedefIf.myOtherUnion" />
       </corba:operation>
       <wsdl:input name="opInRequest">
       </wsdl:input>
@@ -541,30 +541,30 @@
     </wsdl:operation>
     <wsdl:operation name="opOut">
       <corba:operation name="opOut">
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyFloat" idltype="myFloat" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyDouble" idltype="myDouble" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyFloat" idltype="myFloat" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyDouble" idltype="myDouble" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyLongDouble" idltype="myLongDouble" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyShort" idltype="myShort" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyLong" idltype="myLong" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyLongLong" idltype="myLongLong" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyUnsignedShort" idltype="myUnsignedShort" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyUnsignedLong" idltype="myUnsignedLong" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyUnsignedLongLong" idltype="myUnsignedLongLong" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyChar" idltype="myChar" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyWChar" idltype="myWChar" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyBoolean" idltype="myBoolean" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyOctet" idltype="myOctet" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMySeqLong" idltype="mySeqLong" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyString" idltype="myString" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyFixed52" idltype="myFixed52" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyStruct" idltype="myStruct" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyEnum" idltype="myEnum" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyUnion" idltype="myUnion" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyOtherStruct" idltype="myOtherStruct" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyOtherEnum" idltype="myOtherEnum" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyOtherUnion" idltype="myOtherUnion" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyFloat" idltype="TypedefIf.myFloat" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyDouble" idltype="TypedefIf.myDouble" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyFloat" idltype="TypedefIf.myFloat" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyDouble" idltype="TypedefIf.myDouble" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyLongDouble" idltype="TypedefIf.myLongDouble" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyShort" idltype="TypedefIf.myShort" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyLong" idltype="TypedefIf.myLong" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyLongLong" idltype="TypedefIf.myLongLong" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyUnsignedShort" idltype="TypedefIf.myUnsignedShort" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyUnsignedLong" idltype="TypedefIf.myUnsignedLong" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyUnsignedLongLong" idltype="TypedefIf.myUnsignedLongLong" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyChar" idltype="TypedefIf.myChar" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyWChar" idltype="TypedefIf.myWChar" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyBoolean" idltype="TypedefIf.myBoolean" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyOctet" idltype="TypedefIf.myOctet" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMySeqLong" idltype="TypedefIf.mySeqLong" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyString" idltype="TypedefIf.myString" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyFixed52" idltype="TypedefIf.myFixed52" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyStruct" idltype="TypedefIf.myStruct" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyEnum" idltype="TypedefIf.myEnum" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyUnion" idltype="TypedefIf.myUnion" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyOtherStruct" idltype="TypedefIf.myOtherStruct" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyOtherEnum" idltype="TypedefIf.myOtherEnum" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="out" name="outMyOtherUnion" idltype="TypedefIf.myOtherUnion" />
       </corba:operation>
       <wsdl:input name="opOutRequest">
       </wsdl:input>
@@ -573,30 +573,30 @@
     </wsdl:operation>
     <wsdl:operation name="opInOut">
       <corba:operation name="opInOut">
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyFloat" idltype="myFloat" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyDouble" idltype="myDouble" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyFloat" idltype="myFloat" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyDouble" idltype="myDouble" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyLongDouble" idltype="myLongDouble" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyShort" idltype="myShort" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyLong" idltype="myLong" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyLongLong" idltype="myLongLong" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyUnsignedShort" idltype="myUnsignedShort" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyUnsignedLong" idltype="myUnsignedLong" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyUnsignedLongLong" idltype="myUnsignedLongLong" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyChar" idltype="myChar" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyWChar" idltype="myWChar" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyBoolean" idltype="myBoolean" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyOctet" idltype="myOctet" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMySeqLong" idltype="mySeqLong" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyString" idltype="myString" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyFixed52" idltype="myFixed52" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyStruct" idltype="myStruct" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyEnum" idltype="myEnum" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyUnion" idltype="myUnion" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyOtherStruct" idltype="myOtherStruct" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyOtherEnum" idltype="myOtherEnum" />
-        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyOtherUnion" idltype="myOtherUnion" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyFloat" idltype="TypedefIf.myFloat" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyDouble" idltype="TypedefIf.myDouble" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyFloat" idltype="TypedefIf.myFloat" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyDouble" idltype="TypedefIf.myDouble" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyLongDouble" idltype="TypedefIf.myLongDouble" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyShort" idltype="TypedefIf.myShort" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyLong" idltype="TypedefIf.myLong" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyLongLong" idltype="TypedefIf.myLongLong" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyUnsignedShort" idltype="TypedefIf.myUnsignedShort" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyUnsignedLong" idltype="TypedefIf.myUnsignedLong" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyUnsignedLongLong" idltype="TypedefIf.myUnsignedLongLong" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyChar" idltype="TypedefIf.myChar" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyWChar" idltype="TypedefIf.myWChar" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyBoolean" idltype="TypedefIf.myBoolean" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyOctet" idltype="TypedefIf.myOctet" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMySeqLong" idltype="TypedefIf.mySeqLong" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyString" idltype="TypedefIf.myString" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyFixed52" idltype="TypedefIf.myFixed52" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyStruct" idltype="TypedefIf.myStruct" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyEnum" idltype="TypedefIf.myEnum" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyUnion" idltype="TypedefIf.myUnion" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyOtherStruct" idltype="TypedefIf.myOtherStruct" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyOtherEnum" idltype="TypedefIf.myOtherEnum" />
+        <corba:param xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" mode="inout" name="inoutMyOtherUnion" idltype="TypedefIf.myOtherUnion" />
       </corba:operation>
       <wsdl:input name="opInOutRequest">
       </wsdl:input>