incubator-yoko-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r546528 [6/7] - in /incubator/yoko/trunk: ./ api/src/main/resources/schemas/wsdl/ bindings/src/main/java/org/apache/yoko/bindings/corba/types/ bindings/src/test/java/org/apache/yoko/bindings/corba/ tools/ tools/src/main/java/org/apache/yoko...
Date Tue, 12 Jun 2007 15:25:50 GMT
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Inheritance.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Inheritance.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Inheritance.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Inheritance.wsdl Tue Jun 12 08:25:45 2007
@@ -19,8 +19,8 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/inheritance" xmlns:tns="http://schemas.apache.org/yoko/idl/inheritance" xmlns:wsa="http://www.w3.org/2005/08/addressing" 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/inheritance/typemap">
-    <corba:object xmlns:ns5="http://www.w3.org/2005/08/addressing" xmlns:ns4="http://schemas.apache.org/yoko/idl/inheritance/typemap" xmlns="http://schemas.apache.org/yoko/idl/inheritance" binding="org.apache.IpTestCORBABinding" repositoryID="IDL:org/apache/IpTest:1.0" name="ns4:org.apache.IpTest" type="ns5:EndpointReferenceType" />
-    <corba:object xmlns:ns5="http://www.w3.org/2005/08/addressing" xmlns:ns4="http://schemas.apache.org/yoko/idl/inheritance/typemap" xmlns="http://schemas.apache.org/yoko/idl/inheritance" binding="org.apache.yoko.IpInterfaceCORBABinding" repositoryID="IDL:org/apache/yoko/IpInterface:1.0" name="ns4:org.apache.yoko.IpInterface" type="ns5:EndpointReferenceType" />
+    <corba:object xmlns:ns4="http://www.w3.org/2005/08/addressing" xmlns="http://schemas.apache.org/yoko/idl/inheritance" binding="org.apache.IpTestCORBABinding" repositoryID="IDL:org/apache/IpTest:1.0" type="ns4:EndpointReferenceType" name="org.apache.IpTest" />
+    <corba:object xmlns:ns4="http://www.w3.org/2005/08/addressing" xmlns="http://schemas.apache.org/yoko/idl/inheritance" binding="org.apache.yoko.IpInterfaceCORBABinding" repositoryID="IDL:org/apache/yoko/IpInterface:1.0" type="ns4:EndpointReferenceType" name="org.apache.yoko.IpInterface" />
   </corba:typeMapping>
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/inheritance" xmlns="http://schemas.apache.org/yoko/idl/inheritance" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_ObjectRef.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_ObjectRef.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_ObjectRef.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_ObjectRef.wsdl Tue Jun 12 08:25:45 2007
@@ -19,18 +19,18 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/ObjectRef" xmlns:tns="http://schemas.apache.org/yoko/idl/ObjectRef" xmlns:wsa="http://www.w3.org/2005/08/addressing" 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/ObjectRef/typemap">
-    <corba:object xmlns:ns5="http://www.w3.org/2005/08/addressing" xmlns:ns4="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" xmlns="http://schemas.apache.org/yoko/idl/ObjectRef" binding="ObjectRefCORBABinding" repositoryID="IDL:ObjectRef:1.0" name="ns4:ObjectRef" type="ns5:EndpointReferenceType" />
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/ObjectRef" xmlns="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" repositoryID="IDL:TestStruct:1.0" name="TestStruct" type="ns4:TestStruct">
-      <corba:member name="ref" idltype="ObjectRef" />
+    <corba:object xmlns:ns4="http://www.w3.org/2005/08/addressing" xmlns="http://schemas.apache.org/yoko/idl/ObjectRef" binding="ObjectRefCORBABinding" repositoryID="IDL:ObjectRef:1.0" type="ns4:EndpointReferenceType" name="ObjectRef" />
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/ObjectRef" repositoryID="IDL:TestStruct:1.0" type="TestStruct" name="TestStruct">
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" name="ref" idltype="ns4:ObjectRef" />
       <corba:member name="str" idltype="corba:string" />
     </corba:struct>
-    <corba:exception xmlns:ns4="http://schemas.apache.org/yoko/idl/ObjectRef" xmlns="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" repositoryID="IDL:TestException:1.0" name="TestException" type="ns4:TestExceptionType">
-      <corba:member name="ref" idltype="ObjectRef" />
+    <corba:exception xmlns="http://schemas.apache.org/yoko/idl/ObjectRef" repositoryID="IDL:TestException:1.0" type="TestExceptionType" name="TestException">
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" name="ref" idltype="ns4:ObjectRef" />
     </corba:exception>
-    <corba:array xmlns="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" bound="5" repositoryID="IDL:TestArray:1.0" name="TestArray" type="ObjectRef" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/ObjectRef" xmlns="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" elemtype="ObjectRef" bound="0" repositoryID="IDL:TestSequence:1.0" name="TestSequence" type="ns4:TestSequence" />
-    <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/ObjectRef" xmlns="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" discriminator="corba:short" repositoryID="IDL:TestUnion:1.0" name="TestUnion" type="ns4:TestUnion">
-      <corba:unionbranch name="ref" idltype="ObjectRef">
+    <corba:array xmlns:ns4="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" xmlns="" elemname="item" bound="5" repositoryID="IDL:TestArray:1.0" type="ns4:ObjectRef" name="TestArray" />
+    <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/ObjectRef" xmlns:ns4="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" xmlns="" elemtype="ns4:ObjectRef" elemname="item" bound="0" repositoryID="IDL:TestSequence:1.0" type="ns5:TestSequence" name="TestSequence" />
+    <corba:union xmlns="http://schemas.apache.org/yoko/idl/ObjectRef" discriminator="corba:short" repositoryID="IDL:TestUnion:1.0" type="TestUnion" name="TestUnion">
+      <corba:unionbranch xmlns:ns4="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" name="ref" idltype="ns4:ObjectRef">
         <corba:case label="0" />
       </corba:unionbranch>
       <corba:unionbranch name="str" idltype="corba:string">
@@ -38,7 +38,7 @@
       </corba:unionbranch>
       <corba:unionbranch name="def" idltype="corba:long" default="true" />
     </corba:union>
-    <corba:object xmlns:ns4="http://www.w3.org/2005/08/addressing" xmlns="http://schemas.apache.org/yoko/idl/ObjectRef/typemap" repositoryID="IDL:omg.org/CORBA/Object/1.0" name="CORBA.Object" type="ns4:EndpointReferenceType" />
+    <corba:object xmlns="http://www.w3.org/2005/08/addressing" repositoryID="IDL:omg.org/CORBA/Object/1.0" type="EndpointReferenceType" name="CORBA.Object" />
   </corba:typeMapping>
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/ObjectRef" xmlns="http://schemas.apache.org/yoko/idl/ObjectRef" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Octet.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Octet.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Octet.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Octet.wsdl Tue Jun 12 08:25:45 2007
@@ -19,12 +19,12 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/Octet" xmlns:tns="http://schemas.apache.org/yoko/idl/Octet" 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/Octet/typemap">
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Octet/typemap" basetype="corba:octet" repositoryID="IDL:TpOctet:1.0" name="TpOctet" />
+    <corba:alias basetype="corba:octet" repositoryID="IDL:TpOctet:1.0" name="TpOctet" />
     <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Octet/typemap" basetype="TpOctet" repositoryID="IDL:myOctet:1.0" name="myOctet" />
-    <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Octet/typemap" elemtype="TpOctet" bound="0" repositoryID="IDL:TpOctetSet:1.0" name="TpOctetSet" type="xs:base64Binary" />
-    <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Octet/typemap" elemtype="myOctet" bound="0" repositoryID="IDL:TpOctetSet2:1.0" name="TpOctetSet2" type="xs:base64Binary" />
-    <corba:array xmlns="http://schemas.apache.org/yoko/idl/Octet/typemap" bound="6" repositoryID="IDL:TpArrayOctet:1.0" name="TpArrayOctet" type="TpOctet" />
-    <corba:array xmlns="http://schemas.apache.org/yoko/idl/Octet/typemap" bound="6" repositoryID="IDL:TpArrayOctet2:1.0" name="TpArrayOctet2" type="myOctet" />
+    <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns4="http://schemas.apache.org/yoko/idl/Octet/typemap" xmlns="" elemtype="ns4:TpOctet" elemname="item" bound="0" repositoryID="IDL:TpOctetSet:1.0" type="xs:base64Binary" name="TpOctetSet" />
+    <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns4="http://schemas.apache.org/yoko/idl/Octet/typemap" xmlns="" elemtype="ns4:myOctet" elemname="item" bound="0" repositoryID="IDL:TpOctetSet2:1.0" type="xs:base64Binary" name="TpOctetSet2" />
+    <corba:array xmlns:ns4="http://schemas.apache.org/yoko/idl/Octet/typemap" xmlns="" elemname="item" bound="6" repositoryID="IDL:TpArrayOctet:1.0" type="ns4:TpOctet" name="TpArrayOctet" />
+    <corba:array xmlns:ns4="http://schemas.apache.org/yoko/idl/Octet/typemap" xmlns="" elemname="item" bound="6" repositoryID="IDL:TpArrayOctet2:1.0" type="ns4:myOctet" name="TpArrayOctet2" />
   </corba:typeMapping>
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/Octet" xmlns="http://schemas.apache.org/yoko/idl/Octet" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionL.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionL.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionL.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionL.wsdl Tue Jun 12 08:25:45 2007
@@ -19,7 +19,7 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/OptionL" xmlns:tns="http://schemas.apache.org/yoko/idl/OptionL" 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/OptionL/typemap">
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/OptionL" xmlns="http://schemas.apache.org/yoko/idl/OptionL/typemap" repositoryID="IDL:foo/bar/Employee:1.0" name="foo.bar.Employee" type="ns4:foo.bar.Employee">
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/OptionL" repositoryID="IDL:foo/bar/Employee:1.0" type="foo.bar.Employee" name="foo.bar.Employee">
       <corba:member name="name" idltype="corba:string" />
       <corba:member name="number" idltype="corba:long" />
     </corba:struct>

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionsLT.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionsLT.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionsLT.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionsLT.wsdl Tue Jun 12 08:25:45 2007
@@ -19,7 +19,7 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/OptionsLT" xmlns:tns="http://schemas.apache.org/yoko/idl/OptionsLT" 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:xsd1="http://schemas.apache.org/yoko/idl/OptionsLT-types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <corba:typeMapping targetNamespace="http://schemas.apache.org/yoko/idl/OptionsLT/typemap">
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/OptionsLT-types" xmlns="http://schemas.apache.org/yoko/idl/OptionsLT/typemap" repositoryID="IDL:foo/bar/Employee:1.0" name="foo.bar.Employee" type="ns4:foo.bar.Employee">
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/OptionsLT-types" repositoryID="IDL:foo/bar/Employee:1.0" type="foo.bar.Employee" name="foo.bar.Employee">
       <corba:member name="name" idltype="corba:string" />
       <corba:member name="number" idltype="corba:long" />
     </corba:struct>

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionsSchema.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionsSchema.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionsSchema.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionsSchema.wsdl Tue Jun 12 08:25:45 2007
@@ -19,7 +19,7 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/OptionsSchema" xmlns:tns="http://schemas.apache.org/yoko/idl/OptionsSchema" 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:xsd1="http://schemas.apache.org/yoko/idl/OptionsSchema-types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <corba:typeMapping targetNamespace="http://schemas.apache.org/yoko/idl/OptionsSchema/typemap">
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/OptionsSchema-types" xmlns="http://schemas.apache.org/yoko/idl/OptionsSchema/typemap" repositoryID="IDL:foo/bar/Employee:1.0" name="foo.bar.Employee" type="ns4:foo.bar.Employee">
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/OptionsSchema-types" repositoryID="IDL:foo/bar/Employee:1.0" type="foo.bar.Employee" name="foo.bar.Employee">
       <corba:member name="name" idltype="corba:string" />
       <corba:member name="number" idltype="corba:long" />
     </corba:struct>

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Physical.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Physical.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Physical.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Physical.wsdl Tue Jun 12 08:25:45 2007
@@ -19,7 +19,7 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/OptionP" xmlns:tns="http://schemas.apache.org/yoko/idl/OptionP" 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/OptionP/typemap">
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/OptionP" xmlns="http://schemas.apache.org/yoko/idl/OptionP/typemap" repositoryID="IDL:foo/bar/Employee:1.0" name="foo.bar.Employee" type="ns4:foo.bar.Employee">
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/OptionP" repositoryID="IDL:foo/bar/Employee:1.0" type="foo.bar.Employee" name="foo.bar.Employee">
       <corba:member name="name" idltype="corba:string" />
       <corba:member name="number" idltype="corba:long" />
     </corba:struct>

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_PhysicalLP.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_PhysicalLP.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_PhysicalLP.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_PhysicalLP.wsdl Tue Jun 12 08:25:45 2007
@@ -19,7 +19,7 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/OptionsLP" xmlns:tns="http://schemas.apache.org/yoko/idl/OptionsLP" 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/OptionsLP/typemap">
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/OptionsLP" xmlns="http://schemas.apache.org/yoko/idl/OptionsLP/typemap" repositoryID="IDL:foo/bar/Employee:1.0" name="foo.bar.Employee" type="ns4:foo.bar.Employee">
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/OptionsLP" repositoryID="IDL:foo/bar/Employee:1.0" type="foo.bar.Employee" name="foo.bar.Employee">
       <corba:member name="name" idltype="corba:string" />
       <corba:member name="number" idltype="corba:long" />
     </corba:struct>

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_PhysicalLPT.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_PhysicalLPT.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_PhysicalLPT.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_PhysicalLPT.wsdl Tue Jun 12 08:25:45 2007
@@ -19,7 +19,7 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/OptionsLPT" xmlns:tns="http://schemas.apache.org/yoko/idl/OptionsLPT" 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:xsd1="http://schemas.apache.org/yoko/idl/OptionsLPT-types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <corba:typeMapping targetNamespace="http://schemas.apache.org/yoko/idl/OptionsLPT/typemap">
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/OptionsLPT-types" xmlns="http://schemas.apache.org/yoko/idl/OptionsLPT/typemap" repositoryID="IDL:foo/bar/Employee:1.0" name="foo.bar.Employee" type="ns4:foo.bar.Employee">
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/OptionsLPT-types" repositoryID="IDL:foo/bar/Employee:1.0" type="foo.bar.Employee" name="foo.bar.Employee">
       <corba:member name="name" idltype="corba:string" />
       <corba:member name="number" idltype="corba:long" />
     </corba:struct>

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_PhysicalPT.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_PhysicalPT.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_PhysicalPT.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_PhysicalPT.wsdl Tue Jun 12 08:25:45 2007
@@ -19,7 +19,7 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/OptionsPT" xmlns:tns="http://schemas.apache.org/yoko/idl/OptionsPT" 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:xsd1="http://schemas.apache.org/yoko/idl/OptionsPT-types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <corba:typeMapping targetNamespace="http://schemas.apache.org/yoko/idl/OptionsPT/typemap">
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/OptionsPT-types" xmlns="http://schemas.apache.org/yoko/idl/OptionsPT/typemap" repositoryID="IDL:foo/bar/Employee:1.0" name="foo.bar.Employee" type="ns4:foo.bar.Employee">
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/OptionsPT-types" repositoryID="IDL:foo/bar/Employee:1.0" type="foo.bar.Employee" name="foo.bar.Employee">
       <corba:member name="name" idltype="corba:string" />
       <corba:member name="number" idltype="corba:long" />
     </corba:struct>

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Primitives.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Primitives.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Primitives.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Primitives.wsdl Tue Jun 12 08:25:45 2007
@@ -19,7 +19,7 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/primitives" xmlns:tns="http://schemas.apache.org/yoko/idl/primitives" xmlns:corba="http://schemas.apache.org/yoko/bindings/corba" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <corba:typeMapping targetNamespace="http://schemas.apache.org/yoko/idl/primitives/typemap">
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/primitives" xmlns="http://schemas.apache.org/yoko/idl/primitives/typemap" elemtype="corba:string" bound="0" repositoryID="IDL:stringArray:1.0" name="stringArray" type="ns4:stringArray" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Exception/types" xmlns="" elemtype="corba:string" elemname="item" bound="0" repositoryID="IDL:stringArray:1.0" type="ns4:stringArray" name="stringArray" />
   </corba:typeMapping>
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/primitives" xmlns="http://schemas.apache.org/yoko/idl/primitives" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Sequence.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Sequence.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Sequence.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Sequence.wsdl Tue Jun 12 08:25:45 2007
@@ -19,27 +19,27 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/Sequence" xmlns:tns="http://schemas.apache.org/yoko/idl/Sequence" xmlns:corba="http://schemas.apache.org/yoko/bindings/corba" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <corba:typeMapping targetNamespace="http://schemas.apache.org/yoko/idl/Sequence/typemap">
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:long" repositoryID="IDL:longSequence:1.0" name="longSequence" type="ns4:longSequence" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:string" repositoryID="IDL:stringSequence:1.0" name="stringSequence" type="ns4:stringSequence" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="10" elemtype="corba:long" repositoryID="IDL:boundedLongSequence:1.0" name="boundedLongSequence" type="ns4:boundedLongSequence" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="2" elemtype="corba:string" repositoryID="IDL:boundedStringSequence:1.0" name="boundedStringSequence" type="ns4:boundedStringSequence" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="longSequence" repositoryID="IDL:longSequenceSequence:1.0" name="longSequenceSequence" type="ns4:longSequenceSequence" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="boundedLongSequence" repositoryID="IDL:boundedLongSequenceSequence:1.0" name="boundedLongSequenceSequence" type="ns4:boundedLongSequenceSequence" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="30" elemtype="longSequence" repositoryID="IDL:longSequenceBoundedSequence:1.0" name="longSequenceBoundedSequence" type="ns4:longSequenceBoundedSequence" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="10" elemtype="boundedLongSequence" repositoryID="IDL:boundedLongSequenceBoundedSequence:1.0" name="boundedLongSequenceBoundedSequence" type="ns4:boundedLongSequenceBoundedSequence" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:float" repositoryID="IDL:sequences/myFloat:1.0" name="sequences.myFloat" type="ns4:sequences.myFloat" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:double" repositoryID="IDL:sequences/myDouble:1.0" name="sequences.myDouble" type="ns4:sequences.myDouble" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:longdouble" repositoryID="IDL:sequences/myLongDouble:1.0" name="sequences.myLongDouble" type="ns4:sequences.myLongDouble" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:short" repositoryID="IDL:sequences/myShort:1.0" name="sequences.myShort" type="ns4:sequences.myShort" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:long" repositoryID="IDL:sequences/myLong:1.0" name="sequences.myLong" type="ns4:sequences.myLong" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:longlong" repositoryID="IDL:sequences/myLonglong:1.0" name="sequences.myLonglong" type="ns4:sequences.myLonglong" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:ushort" repositoryID="IDL:sequences/myUnsignedShort:1.0" name="sequences.myUnsignedShort" type="ns4:sequences.myUnsignedShort" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:ulong" repositoryID="IDL:sequences/myUnsignedLong:1.0" name="sequences.myUnsignedLong" type="ns4:sequences.myUnsignedLong" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:ulonglong" repositoryID="IDL:sequences/myUnsignedLongLong:1.0" name="sequences.myUnsignedLongLong" type="ns4:sequences.myUnsignedLongLong" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:char" repositoryID="IDL:sequences/myChar:1.0" name="sequences.myChar" type="ns4:sequences.myChar" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:wchar" repositoryID="IDL:sequences/myWchar:1.0" name="sequences.myWchar" type="ns4:sequences.myWchar" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:boolean" repositoryID="IDL:sequences/myBoolean:1.0" name="sequences.myBoolean" type="ns4:sequences.myBoolean" />
-    <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/Sequence/typemap" bound="0" elemtype="corba:octet" repositoryID="IDL:sequences/myOctet:1.0" name="sequences.myOctet" type="xs:base64Binary" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="" elemtype="corba:long" elemname="item" bound="0" repositoryID="IDL:longSequence:1.0" type="ns4:longSequence" name="longSequence" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="" elemtype="corba:string" elemname="item" bound="0" repositoryID="IDL:stringSequence:1.0" type="ns4:stringSequence" name="stringSequence" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="" elemtype="corba:long" elemname="item" bound="10" repositoryID="IDL:boundedLongSequence:1.0" type="ns4:boundedLongSequence" name="boundedLongSequence" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="" elemtype="corba:string" elemname="item" bound="2" repositoryID="IDL:boundedStringSequence:1.0" type="ns4:boundedStringSequence" name="boundedStringSequence" />
+    <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/Sequence" xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence/typemap" xmlns="" elemtype="ns4:longSequence" elemname="item" bound="0" repositoryID="IDL:longSequenceSequence:1.0" type="ns5:longSequenceSequence" name="longSequenceSequence" />
+    <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/Sequence" xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence/typemap" xmlns="" elemtype="ns4:boundedLongSequence" elemname="item" bound="0" repositoryID="IDL:boundedLongSequenceSequence:1.0" type="ns5:boundedLongSequenceSequence" name="boundedLongSequenceSequence" />
+    <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/Sequence" xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence/typemap" xmlns="" elemtype="ns4:longSequence" elemname="item" bound="30" repositoryID="IDL:longSequenceBoundedSequence:1.0" type="ns5:longSequenceBoundedSequence" name="longSequenceBoundedSequence" />
+    <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/Sequence" xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence/typemap" xmlns="" elemtype="ns4:boundedLongSequence" elemname="item" bound="10" repositoryID="IDL:boundedLongSequenceBoundedSequence:1.0" type="ns5:boundedLongSequenceBoundedSequence" name="boundedLongSequenceBoundedSequence" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="" elemtype="corba:float" elemname="item" bound="0" repositoryID="IDL:sequences/myFloat:1.0" type="ns4:sequences.myFloat" name="sequences.myFloat" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="" elemtype="corba:double" elemname="item" bound="0" repositoryID="IDL:sequences/myDouble:1.0" type="ns4:sequences.myDouble" name="sequences.myDouble" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="" elemtype="corba:longdouble" elemname="item" bound="0" repositoryID="IDL:sequences/myLongDouble:1.0" type="ns4:sequences.myLongDouble" name="sequences.myLongDouble" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="" elemtype="corba:short" elemname="item" bound="0" repositoryID="IDL:sequences/myShort:1.0" type="ns4:sequences.myShort" name="sequences.myShort" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="" elemtype="corba:long" elemname="item" bound="0" repositoryID="IDL:sequences/myLong:1.0" type="ns4:sequences.myLong" name="sequences.myLong" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="" elemtype="corba:longlong" elemname="item" bound="0" repositoryID="IDL:sequences/myLonglong:1.0" type="ns4:sequences.myLonglong" name="sequences.myLonglong" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="" elemtype="corba:ushort" elemname="item" bound="0" repositoryID="IDL:sequences/myUnsignedShort:1.0" type="ns4:sequences.myUnsignedShort" name="sequences.myUnsignedShort" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="" elemtype="corba:ulong" elemname="item" bound="0" repositoryID="IDL:sequences/myUnsignedLong:1.0" type="ns4:sequences.myUnsignedLong" name="sequences.myUnsignedLong" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="" elemtype="corba:ulonglong" elemname="item" bound="0" repositoryID="IDL:sequences/myUnsignedLongLong:1.0" type="ns4:sequences.myUnsignedLongLong" name="sequences.myUnsignedLongLong" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="" elemtype="corba:char" elemname="item" bound="0" repositoryID="IDL:sequences/myChar:1.0" type="ns4:sequences.myChar" name="sequences.myChar" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="" elemtype="corba:wchar" elemname="item" bound="0" repositoryID="IDL:sequences/myWchar:1.0" type="ns4:sequences.myWchar" name="sequences.myWchar" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Sequence" xmlns="" elemtype="corba:boolean" elemname="item" bound="0" repositoryID="IDL:sequences/myBoolean:1.0" type="ns4:sequences.myBoolean" name="sequences.myBoolean" />
+    <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="" elemtype="corba:octet" elemname="item" bound="0" repositoryID="IDL:sequences/myOctet:1.0" type="xs:base64Binary" name="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">

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_String.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_String.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_String.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_String.wsdl Tue Jun 12 08:25:45 2007
@@ -19,21 +19,21 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/String" xmlns:tns="http://schemas.apache.org/yoko/idl/String" 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/String/typemap">
-    <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" bound="10" name="_1_string10" type="ns4:string10" />
-    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="_1_string10" repositoryID="IDL:string10:1.0" name="string10" type="ns4:string10" />
-    <corba:anonwstring xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" bound="20" name="_1_wstring20" type="ns4:wstring20" />
-    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="_1_wstring20" repositoryID="IDL:wstring20:1.0" name="wstring20" type="ns4:wstring20" />
+    <corba:anonstring xmlns="http://schemas.apache.org/yoko/idl/String" bound="10" type="string10" name="_1_string10" />
+    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="_1_string10" repositoryID="IDL:string10:1.0" type="ns4:string10" name="string10" />
+    <corba:anonwstring xmlns="http://schemas.apache.org/yoko/idl/String" bound="20" type="wstring20" name="_1_wstring20" />
+    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="_1_wstring20" repositoryID="IDL:wstring20:1.0" type="ns4:wstring20" name="wstring20" />
     <corba:alias xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="string10" repositoryID="IDL:myString10:1.0" name="myString10" />
     <corba:alias xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="wstring20" repositoryID="IDL:myWString20:1.0" name="myWString20" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="corba:string" repositoryID="IDL:myString:1.0" name="myString" type="xs:string" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="corba:wstring" repositoryID="IDL:myWString:1.0" name="myWString" type="xs:string" />
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" repositoryID="IDL:strStruct:1.0" name="strStruct" type="ns4:strStruct">
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" basetype="corba:string" repositoryID="IDL:myString:1.0" type="xs:string" name="myString" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" basetype="corba:wstring" repositoryID="IDL:myWString:1.0" type="xs:string" name="myWString" />
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/String" repositoryID="IDL:strStruct:1.0" type="strStruct" name="strStruct">
       <corba:member name="unboundedStr" idltype="corba:string" />
-      <corba:member name="boundedStr10" idltype="string10" />
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/String/typemap" name="boundedStr10" idltype="ns4:string10" />
       <corba:member name="unboundedWStr" idltype="corba:wstring" />
-      <corba:member name="boundedWStr20" idltype="wstring20" />
-      <corba:member name="myStringStruct" idltype="myString" />
-      <corba:member name="myWStringStruct" idltype="myWString" />
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/String/typemap" name="boundedWStr20" idltype="ns4:wstring20" />
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/String/typemap" name="myStringStruct" idltype="ns4:myString" />
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/String/typemap" name="myWStringStruct" idltype="ns4:myWString" />
     </corba:struct>
   </corba:typeMapping>
   <wsdl:types>

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_String_unbounded.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_String_unbounded.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_String_unbounded.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_String_unbounded.wsdl Tue Jun 12 08:25:45 2007
@@ -19,19 +19,19 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/String" xmlns:tns="http://schemas.apache.org/yoko/idl/String" 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/String/typemap">
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="corba:string" repositoryID="IDL:string10:1.0" name="string10" type="xs:string" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="corba:wstring" repositoryID="IDL:wstring20:1.0" name="wstring20" type="xs:string" />
-    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="string10" repositoryID="IDL:myString10:1.0" name="myString10" />
-    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="wstring20" repositoryID="IDL:myWString20:1.0" name="myWString20" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="corba:string" repositoryID="IDL:myString:1.0" name="myString" type="xs:string" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="corba:wstring" repositoryID="IDL:myWString:1.0" name="myWString" type="xs:string" />
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/String" xmlns="http://schemas.apache.org/yoko/idl/String/typemap" repositoryID="IDL:strStruct:1.0" name="strStruct" type="ns4:strStruct">
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" basetype="corba:string" repositoryID="IDL:string10:1.0" type="xs:string" name="string10" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" basetype="corba:wstring" repositoryID="IDL:wstring20:1.0" type="xs:string" name="wstring20" />
+    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="string10" repositoryID="IDL:myString10:1.0" name="myString10" />
+    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/String/typemap" basetype="wstring20" repositoryID="IDL:myWString20:1.0" name="myWString20" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" basetype="corba:string" repositoryID="IDL:myString:1.0" type="xs:string" name="myString" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" basetype="corba:wstring" repositoryID="IDL:myWString:1.0" type="xs:string" name="myWString" />
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/String" repositoryID="IDL:strStruct:1.0" type="strStruct" name="strStruct">
       <corba:member name="unboundedStr" idltype="corba:string" />
-      <corba:member name="boundedStr10" idltype="string10" />
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/String/typemap" name="boundedStr10" idltype="ns4:string10" />
       <corba:member name="unboundedWStr" idltype="corba:wstring" />
-      <corba:member name="boundedWStr20" idltype="wstring20" />
-      <corba:member name="myStringStruct" idltype="myString" />
-      <corba:member name="myWStringStruct" idltype="myWString" />
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/String/typemap" name="boundedWStr20" idltype="ns4:wstring20" />
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/String/typemap" name="myStringStruct" idltype="ns4:myString" />
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/String/typemap" name="myWStringStruct" idltype="ns4:myWString" />
     </corba:struct>
   </corba:typeMapping>
   <wsdl:types>

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Struct.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Struct.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Struct.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Struct.wsdl Tue Jun 12 08:25:45 2007
@@ -19,27 +19,27 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/Struct" xmlns:tns="http://schemas.apache.org/yoko/idl/Struct" xmlns:corba="http://schemas.apache.org/yoko/bindings/corba" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <corba:typeMapping targetNamespace="http://schemas.apache.org/yoko/idl/Struct/typemap">
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct" xmlns="http://schemas.apache.org/yoko/idl/Struct/typemap" repositoryID="IDL:OutsideStruct:1.0" name="OutsideStruct" type="ns4:OutsideStruct">
-      <corba:member idltype="corba:long" name="number" />
-      <corba:member idltype="corba:string" name="word" />
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/Exception/types" repositoryID="IDL:OutsideStruct:1.0" type="OutsideStruct" name="OutsideStruct">
+      <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:StructTest/Employee:1.0" name="StructTest.Employee" type="ns4:StructTest.Employee">
-      <corba:member idltype="corba:string" name="name" />
-      <corba:member idltype="corba:string" name="dept" />
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/Exception/types" repositoryID="IDL:StructTest/Employee:1.0" type="StructTest.Employee" name="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:StructTest/Compensation:1.0" name="StructTest.Compensation" type="ns4:StructTest.Compensation">
-      <corba:member idltype="corba:long" name="amount" />
-      <corba:member idltype="corba:string" name="currency" />
-      <corba:member idltype="corba:string" name="praise" />
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/Exception/types" repositoryID="IDL:StructTest/Compensation:1.0" type="StructTest.Compensation" name="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:StructTest/NestedOutsideStruct:1.0" name="StructTest.NestedOutsideStruct" type="ns4:StructTest.NestedOutsideStruct">
-      <corba:member idltype="corba:short" name="aShort" />
-      <corba:member idltype="corba:long" name="aLong" />
-      <corba:member idltype="OutsideStruct" name="outsider" />
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/Exception/types" repositoryID="IDL:StructTest/NestedOutsideStruct:1.0" type="StructTest.NestedOutsideStruct" name="StructTest.NestedOutsideStruct">
+      <corba:member name="aShort" idltype="corba:short" />
+      <corba:member name="aLong" idltype="corba:long" />
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct/typemap" name="outsider" idltype="ns4: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:StructTest/NestedStructs:1.0" name="StructTest.NestedStructs" type="ns4:StructTest.NestedStructs">
-      <corba:member idltype="StructTest.Employee" name="employStruct" />
-      <corba:member idltype="StructTest.Compensation" name="compensationStruct" />
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/Exception/types" repositoryID="IDL:StructTest/NestedStructs:1.0" type="StructTest.NestedStructs" name="StructTest.NestedStructs">
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct/typemap" name="employStruct" idltype="ns4:StructTest.Employee" />
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/Struct/typemap" name="compensationStruct" idltype="ns4:StructTest.Compensation" />
     </corba:struct>
   </corba:typeMapping>
   <wsdl:types>

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Typedef.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Typedef.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Typedef.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Typedef.wsdl Tue Jun 12 08:25:45 2007
@@ -19,40 +19,40 @@
 -->
 <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="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:float" repositoryID="IDL:TypedefIf/myFloat:1.0" name="TypedefIf.myFloat" />
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:double" repositoryID="IDL:TypedefIf/myDouble:1.0" name="TypedefIf.myDouble" />
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:longdouble" repositoryID="IDL:TypedefIf/myLongDouble:1.0" name="TypedefIf.myLongDouble" />
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:short" repositoryID="IDL:TypedefIf/myShort:1.0" name="TypedefIf.myShort" />
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:long" repositoryID="IDL:TypedefIf/myLong:1.0" name="TypedefIf.myLong" />
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:longlong" repositoryID="IDL:TypedefIf/myLongLong:1.0" name="TypedefIf.myLongLong" />
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:ushort" repositoryID="IDL:TypedefIf/myUnsignedShort:1.0" name="TypedefIf.myUnsignedShort" />
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:ulong" repositoryID="IDL:TypedefIf/myUnsignedLong:1.0" name="TypedefIf.myUnsignedLong" />
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:ulonglong" repositoryID="IDL:TypedefIf/myUnsignedLongLong:1.0" name="TypedefIf.myUnsignedLongLong" />
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:char" repositoryID="IDL:TypedefIf/myChar:1.0" name="TypedefIf.myChar" />
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:wchar" repositoryID="IDL:TypedefIf/myWChar:1.0" name="TypedefIf.myWChar" />
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:boolean" repositoryID="IDL:TypedefIf/myBoolean:1.0" name="TypedefIf.myBoolean" />
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:octet" repositoryID="IDL:TypedefIf/myOctet:1.0" name="TypedefIf.myOctet" />
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="corba:any" repositoryID="IDL:TypedefIf/myAny:1.0" name="TypedefIf.myAny" />
-    <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:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" bound="10" name="TypedefIf._1_aBoundedString" type="ns4:TypedefIf.aBoundedString" />
-    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf._1_aBoundedString" repositoryID="IDL:TypedefIf/aBoundedString:1.0" name="TypedefIf.aBoundedString" type="ns4:TypedefIf.aBoundedString" />
-    <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 basetype="corba:float" repositoryID="IDL:TypedefIf/myFloat:1.0" name="TypedefIf.myFloat" />
+    <corba:alias basetype="corba:double" repositoryID="IDL:TypedefIf/myDouble:1.0" name="TypedefIf.myDouble" />
+    <corba:alias basetype="corba:longdouble" repositoryID="IDL:TypedefIf/myLongDouble:1.0" name="TypedefIf.myLongDouble" />
+    <corba:alias basetype="corba:short" repositoryID="IDL:TypedefIf/myShort:1.0" name="TypedefIf.myShort" />
+    <corba:alias basetype="corba:long" repositoryID="IDL:TypedefIf/myLong:1.0" name="TypedefIf.myLong" />
+    <corba:alias basetype="corba:longlong" repositoryID="IDL:TypedefIf/myLongLong:1.0" name="TypedefIf.myLongLong" />
+    <corba:alias basetype="corba:ushort" repositoryID="IDL:TypedefIf/myUnsignedShort:1.0" name="TypedefIf.myUnsignedShort" />
+    <corba:alias basetype="corba:ulong" repositoryID="IDL:TypedefIf/myUnsignedLong:1.0" name="TypedefIf.myUnsignedLong" />
+    <corba:alias basetype="corba:ulonglong" repositoryID="IDL:TypedefIf/myUnsignedLongLong:1.0" name="TypedefIf.myUnsignedLongLong" />
+    <corba:alias basetype="corba:char" repositoryID="IDL:TypedefIf/myChar:1.0" name="TypedefIf.myChar" />
+    <corba:alias basetype="corba:wchar" repositoryID="IDL:TypedefIf/myWChar:1.0" name="TypedefIf.myWChar" />
+    <corba:alias basetype="corba:boolean" repositoryID="IDL:TypedefIf/myBoolean:1.0" name="TypedefIf.myBoolean" />
+    <corba:alias basetype="corba:octet" repositoryID="IDL:TypedefIf/myOctet:1.0" name="TypedefIf.myOctet" />
+    <corba:alias basetype="corba:any" repositoryID="IDL:TypedefIf/myAny:1.0" name="TypedefIf.myAny" />
+    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="" elemtype="corba:long" elemname="item" bound="0" repositoryID="IDL:TypedefIf/SeqLong:1.0" type="ns4:TypedefIf.SeqLong" name="TypedefIf.SeqLong" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" basetype="corba:string" repositoryID="IDL:TypedefIf/aString:1.0" type="xs:string" name="TypedefIf.aString" />
+    <corba:anonstring xmlns="http://schemas.apache.org/yoko/idl/Typedef" bound="10" type="TypedefIf.aBoundedString" name="TypedefIf._1_aBoundedString" />
+    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef" xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf._1_aBoundedString" repositoryID="IDL:TypedefIf/aBoundedString:1.0" type="ns4:TypedefIf.aBoundedString" name="TypedefIf.aBoundedString" />
+    <corba:fixed xmlns="http://schemas.apache.org/yoko/idl/Typedef" scale="2" digits="5" repositoryID="IDL:TypedefIf/Fixed52:1.0" type="TypedefIf.Fixed52" name="TypedefIf.Fixed52" />
     <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.SeqLong" repositoryID="IDL:TypedefIf/mySeqLong:1.0" name="TypedefIf.mySeqLong" />
     <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.aString" repositoryID="IDL:TypedefIf/myString:1.0" name="TypedefIf.myString" />
     <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.aBoundedString" repositoryID="IDL:TypedefIf/myBoundedString:1.0" name="TypedefIf.myBoundedString" />
     <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.Fixed52" repositoryID="IDL:TypedefIf/myFixed52:1.0" name="TypedefIf.myFixed52" />
-    <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:struct xmlns="http://schemas.apache.org/yoko/idl/Typedef" repositoryID="IDL:TypedefIf/aStruct:1.0" type="TypedefIf.aStruct" name="TypedefIf.aStruct">
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef/typemap" name="aStructMyLong" idltype="ns4:TypedefIf.myLong" />
       <corba:member name="aLong" idltype="corba:long" />
     </corba:struct>
     <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.aStruct" repositoryID="IDL:TypedefIf/myStruct:1.0" name="TypedefIf.myStruct" />
-    <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:enum xmlns="http://schemas.apache.org/yoko/idl/Typedef" repositoryID="IDL:TypedefIf/aEnum:1.0" type="TypedefIf.aEnum" name="TypedefIf.aEnum">
       <corba:enumerator value="aEnum1" />
       <corba:enumerator value="aEnum2" />
     </corba:enum>
     <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.aEnum" repositoryID="IDL:TypedefIf/myEnum:1.0" name="TypedefIf.myEnum" />
-    <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: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" type="ns4:TypedefIf.aUnion" name="TypedefIf.aUnion">
       <corba:unionbranch name="aUnionMyLong" idltype="TypedefIf.myLong">
         <corba:case label="aEnum1" />
       </corba:unionbranch>
@@ -62,17 +62,17 @@
       <corba:unionbranch name="aUnionMyBoolean" idltype="TypedefIf.myBoolean" default="true" />
     </corba:union>
     <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.aUnion" repositoryID="IDL:TypedefIf/myUnion:1.0" name="TypedefIf.myUnion" />
-    <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:struct xmlns="http://schemas.apache.org/yoko/idl/Typedef" repositoryID="IDL:TypedefIf/anotherStruct:1.0" type="TypedefIf.anotherStruct" name="TypedefIf.anotherStruct">
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/Typedef/typemap" name="myOtherLong" idltype="ns4:TypedefIf.myLong" />
       <corba:member name="anotherLong" idltype="corba:long" />
     </corba:struct>
     <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.anotherStruct" repositoryID="IDL:TypedefIf/myOtherStruct:1.0" name="TypedefIf.myOtherStruct" />
-    <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:enum xmlns="http://schemas.apache.org/yoko/idl/Typedef" repositoryID="IDL:TypedefIf/anotherEnum:1.0" type="TypedefIf.anotherEnum" name="TypedefIf.anotherEnum">
       <corba:enumerator value="anotherEnum1" />
       <corba:enumerator value="anotherEnum2" />
     </corba:enum>
     <corba:alias xmlns="http://schemas.apache.org/yoko/idl/Typedef/typemap" basetype="TypedefIf.anotherEnum" repositoryID="IDL:TypedefIf/myOtherEnum:1.0" name="TypedefIf.myOtherEnum" />
-    <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: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" type="ns4:TypedefIf.anotherUnion" name="TypedefIf.anotherUnion">
       <corba:unionbranch name="anotherUnionMyLong" idltype="TypedefIf.myLong">
         <corba:case label="anotherEnum1" />
       </corba:unionbranch>

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_Union.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_Union.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_Union.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_Union.wsdl Tue Jun 12 08:25:45 2007
@@ -19,71 +19,71 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/Union" xmlns:tns="http://schemas.apache.org/yoko/idl/Union" 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/Union/typemap">
-    <corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" repositoryID="IDL:e1:1.0" name="e1" type="ns4:e1">
+    <corba:enum xmlns="http://schemas.apache.org/yoko/idl/Exception/types" repositoryID="IDL:e1:1.0" type="e1" name="e1">
       <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/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" repositoryID="IDL:s1:1.0" name="s1" type="ns4:s1">
-      <corba:member idltype="corba:short" name="s1_1" />
-      <corba:member idltype="corba:short" name="s1_2" />
-      <corba:member idltype="corba:short" name="s1_3" />
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/Exception/types" repositoryID="IDL:s1:1.0" type="s1" name="s1">
+      <corba:member name="s1_1" idltype="corba:short" />
+      <corba:member name="s1_2" idltype="corba:short" />
+      <corba:member name="s1_3" idltype="corba:short" />
     </corba:struct>
-    <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" discriminator="e1" repositoryID="IDL:u1:1.0" name="u1" type="ns4:u1">
-      <corba:unionbranch idltype="corba:long" name="u1_1">
+    <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Exception/types" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" discriminator="e1" repositoryID="IDL:u1:1.0" type="ns4:u1" name="u1">
+      <corba:unionbranch name="u1_1" idltype="corba:long">
         <corba:case label="e1_1" />
       </corba:unionbranch>
-      <corba:unionbranch idltype="corba:string" name="u1_2">
+      <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 default="true" idltype="s1" name="u1_3" />
+      <corba:unionbranch name="u1_3" idltype="s1" default="true" />
     </corba:union>
-    <corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" repositoryID="IDL:if/e2:1.0" name="if.e2" type="ns4:if.e2">
+    <corba:enum xmlns="http://schemas.apache.org/yoko/idl/Exception/types" repositoryID="IDL:if/e2:1.0" type="if.e2" name="if.e2">
       <corba:enumerator value="e2_1" />
       <corba:enumerator value="e2_2" />
       <corba:enumerator value="e2_3" />
       <corba:enumerator value="e2_4" />
     </corba:enum>
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" repositoryID="IDL:if/s2:1.0" name="if.s2" type="ns4:if.s2">
-      <corba:member idltype="corba:short" name="s2_1" />
-      <corba:member idltype="corba:short" name="s2_2" />
-      <corba:member idltype="corba:short" name="s2_3" />
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/Exception/types" repositoryID="IDL:if/s2:1.0" type="if.s2" name="if.s2">
+      <corba:member name="s2_1" idltype="corba:short" />
+      <corba:member name="s2_2" idltype="corba:short" />
+      <corba:member name="s2_3" idltype="corba:short" />
     </corba:struct>
-    <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" discriminator="if.e2" repositoryID="IDL:if/u2:1.0" name="if.u2" type="ns4:if.u2">
-      <corba:unionbranch idltype="corba:long" name="u2_1">
+    <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Exception/types" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" discriminator="if.e2" repositoryID="IDL:if/u2:1.0" type="ns4:if.u2" name="if.u2">
+      <corba:unionbranch name="u2_1" idltype="corba:long">
         <corba:case label="e2_1" />
       </corba:unionbranch>
-      <corba:unionbranch idltype="corba:string" name="u2_2">
+      <corba:unionbranch name="u2_2" idltype="corba:string">
         <corba:case label="e2_3" />
         <corba:case label="e2_2" />
         <corba:case label="e2_2" />
       </corba:unionbranch>
-      <corba:unionbranch default="true" idltype="if.s2" name="u2_3" />
+      <corba:unionbranch name="u2_3" idltype="if.s2" default="true" />
     </corba:union>
-    <corba:enum xmlns:ns4="http://schemas.apache.org/yoko/idl/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" repositoryID="IDL:m/e3:1.0" name="m.e3" type="ns4:m.e3">
+    <corba:enum xmlns="http://schemas.apache.org/yoko/idl/Exception/types" repositoryID="IDL:m/e3:1.0" type="m.e3" name="m.e3">
       <corba:enumerator value="e3_1" />
       <corba:enumerator value="e3_2" />
       <corba:enumerator value="e3_3" />
       <corba:enumerator value="e3_4" />
     </corba:enum>
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" repositoryID="IDL:m/s3:1.0" name="m.s3" type="ns4:m.s3">
-      <corba:member idltype="corba:short" name="s3_1" />
-      <corba:member idltype="corba:short" name="s3_2" />
-      <corba:member idltype="corba:short" name="s3_3" />
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/Exception/types" repositoryID="IDL:m/s3:1.0" type="m.s3" name="m.s3">
+      <corba:member name="s3_1" idltype="corba:short" />
+      <corba:member name="s3_2" idltype="corba:short" />
+      <corba:member name="s3_3" idltype="corba:short" />
     </corba:struct>
-    <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Union" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" discriminator="m.e3" repositoryID="IDL:m/u3:1.0" name="m.u3" type="ns4:m.u3">
-      <corba:unionbranch idltype="corba:long" name="u3_1">
+    <corba:union xmlns:ns4="http://schemas.apache.org/yoko/idl/Exception/types" xmlns="http://schemas.apache.org/yoko/idl/Union/typemap" discriminator="m.e3" repositoryID="IDL:m/u3:1.0" type="ns4:m.u3" name="m.u3">
+      <corba:unionbranch name="u3_1" idltype="corba:long">
         <corba:case label="e3_1" />
       </corba:unionbranch>
-      <corba:unionbranch idltype="corba:string" name="u3_2">
+      <corba:unionbranch name="u3_2" idltype="corba:string">
         <corba:case label="e3_3" />
         <corba:case label="e3_2" />
         <corba:case label="e3_2" />
       </corba:unionbranch>
-      <corba:unionbranch default="true" idltype="m.s3" name="u3_3" />
+      <corba:unionbranch name="u3_3" idltype="m.s3" default="true" />
     </corba:union>
   </corba:typeMapping>
   <wsdl:types>

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_base64Binary_sequence_octet.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_base64Binary_sequence_octet.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_base64Binary_sequence_octet.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_base64Binary_sequence_octet.wsdl Tue Jun 12 08:25:45 2007
@@ -19,11 +19,11 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:tns="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:corba="http://schemas.apache.org/yoko/bindings/corba" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <corba:typeMapping targetNamespace="http://schemas.apache.org/yoko/idl/sequence_octet/typemap">
-    <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" elemtype="corba:octet" bound="0" repositoryID="IDL:mySequenceOctet:1.0" name="mySequenceOctet" type="xs:base64Binary" />
-    <corba:anonsequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" elemtype="corba:octet" bound="0" name="_1_mySequenceSequenceOctet" type="xs:base64Binary" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" elemtype="_1_mySequenceSequenceOctet" bound="0" repositoryID="IDL:mySequenceSequenceOctet:1.0" name="mySequenceSequenceOctet" type="ns4:mySequenceSequenceOctet" />
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" basetype="corba:octet" repositoryID="IDL:aliasOctet:1.0" name="aliasOctet" />
-    <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" elemtype="aliasOctet" bound="0" repositoryID="IDL:octetSeq:1.0" name="octetSeq" type="xs:base64Binary" />
+    <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="" elemtype="corba:octet" elemname="item" bound="0" repositoryID="IDL:mySequenceOctet:1.0" type="xs:base64Binary" name="mySequenceOctet" />
+    <corba:anonsequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="" elemtype="corba:octet" elemname="item" bound="0" type="xs:base64Binary" name="_1_mySequenceSequenceOctet" />
+    <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:ns4="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" xmlns="" elemtype="ns4:_1_mySequenceSequenceOctet" elemname="item" bound="0" repositoryID="IDL:mySequenceSequenceOctet:1.0" type="ns5:mySequenceSequenceOctet" name="mySequenceSequenceOctet" />
+    <corba:alias basetype="corba:octet" repositoryID="IDL:aliasOctet:1.0" name="aliasOctet" />
+    <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns4="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" xmlns="" elemtype="ns4:aliasOctet" elemname="item" bound="0" repositoryID="IDL:octetSeq:1.0" type="xs:base64Binary" name="octetSeq" />
   </corba:typeMapping>
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_hexBinary_sequence_octet.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_hexBinary_sequence_octet.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_hexBinary_sequence_octet.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_hexBinary_sequence_octet.wsdl Tue Jun 12 08:25:45 2007
@@ -19,11 +19,11 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:tns="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:corba="http://schemas.apache.org/yoko/bindings/corba" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <corba:typeMapping targetNamespace="http://schemas.apache.org/yoko/idl/sequence_octet/typemap">
-    <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" elemtype="corba:octet" bound="0" repositoryID="IDL:mySequenceOctet:1.0" name="mySequenceOctet" type="xs:hexBinary" />
-    <corba:anonsequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" elemtype="corba:octet" bound="0" name="_1_mySequenceSequenceOctet" type="xs:hexBinary" />
-    <corba:sequence xmlns:ns4="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" elemtype="_1_mySequenceSequenceOctet" bound="0" repositoryID="IDL:mySequenceSequenceOctet:1.0" name="mySequenceSequenceOctet" type="ns4:mySequenceSequenceOctet" />
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" basetype="corba:octet" repositoryID="IDL:aliasOctet:1.0" name="aliasOctet" />
-    <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" elemtype="aliasOctet" bound="0" repositoryID="IDL:octetSeq:1.0" name="octetSeq" type="xs:hexBinary" />
+    <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="" elemtype="corba:octet" elemname="item" bound="0" repositoryID="IDL:mySequenceOctet:1.0" type="xs:hexBinary" name="mySequenceOctet" />
+    <corba:anonsequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="" elemtype="corba:octet" elemname="item" bound="0" type="xs:hexBinary" name="_1_mySequenceSequenceOctet" />
+    <corba:sequence xmlns:ns5="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:ns4="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" xmlns="" elemtype="ns4:_1_mySequenceSequenceOctet" elemname="item" bound="0" repositoryID="IDL:mySequenceSequenceOctet:1.0" type="ns5:mySequenceSequenceOctet" name="mySequenceSequenceOctet" />
+    <corba:alias basetype="corba:octet" repositoryID="IDL:aliasOctet:1.0" name="aliasOctet" />
+    <corba:sequence xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns4="http://schemas.apache.org/yoko/idl/sequence_octet/typemap" xmlns="" elemtype="ns4:aliasOctet" elemname="item" bound="0" repositoryID="IDL:octetSeq:1.0" type="xs:hexBinary" name="octetSeq" />
   </corba:typeMapping>
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns="http://schemas.apache.org/yoko/idl/sequence_octet" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopedString.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopedString.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopedString.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopedString.wsdl Tue Jun 12 08:25:45 2007
@@ -19,12 +19,12 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/scopedString" xmlns:tns="http://schemas.apache.org/yoko/idl/scopedString" 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/scopedString/typemap">
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/scopedString/typemap" basetype="corba:string" repositoryID="IDL:mod/int/str/myString:1.0" name="mod.int.str.myString" type="xs:string" />
-    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.apache.org/yoko/idl/scopedString/typemap" basetype="corba:wstring" repositoryID="IDL:mod/int/str/myWString:1.0" name="mod.int.str.myWString" type="xs:string" />
-    <corba:anonstring xmlns:ns4="http://schemas.apache.org/yoko/idl/scopedString" xmlns="http://schemas.apache.org/yoko/idl/scopedString/typemap" bound="10" name="mod.int.str._1_myString10" type="ns4:mod.int.str.myString10" />
-    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/scopedString" xmlns="http://schemas.apache.org/yoko/idl/scopedString/typemap" basetype="mod.int.str._1_myString10" repositoryID="IDL:mod/int/str/myString10:1.0" name="mod.int.str.myString10" type="ns4:mod.int.str.myString10" />
-    <corba:anonwstring xmlns:ns4="http://schemas.apache.org/yoko/idl/scopedString" xmlns="http://schemas.apache.org/yoko/idl/scopedString/typemap" bound="10" name="mod.int.str._1_myWString10" type="ns4:mod.int.str.myWString10" />
-    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/scopedString" xmlns="http://schemas.apache.org/yoko/idl/scopedString/typemap" basetype="mod.int.str._1_myWString10" repositoryID="IDL:mod/int/str/myWString10:1.0" name="mod.int.str.myWString10" type="ns4:mod.int.str.myWString10" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" basetype="corba:string" repositoryID="IDL:mod/int/str/myString:1.0" type="xs:string" name="mod.int.str.myString" />
+    <corba:alias xmlns:xs="http://www.w3.org/2001/XMLSchema" basetype="corba:wstring" repositoryID="IDL:mod/int/str/myWString:1.0" type="xs:string" name="mod.int.str.myWString" />
+    <corba:anonstring xmlns="http://schemas.apache.org/yoko/idl/scopedString" bound="10" type="mod.int.str.myString10" name="mod.int.str._1_myString10" />
+    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/scopedString" xmlns="http://schemas.apache.org/yoko/idl/scopedString/typemap" basetype="mod.int.str._1_myString10" repositoryID="IDL:mod/int/str/myString10:1.0" type="ns4:mod.int.str.myString10" name="mod.int.str.myString10" />
+    <corba:anonwstring xmlns="http://schemas.apache.org/yoko/idl/scopedString" bound="10" type="mod.int.str.myWString10" name="mod.int.str._1_myWString10" />
+    <corba:alias xmlns:ns4="http://schemas.apache.org/yoko/idl/scopedString" xmlns="http://schemas.apache.org/yoko/idl/scopedString/typemap" basetype="mod.int.str._1_myWString10" repositoryID="IDL:mod/int/str/myWString10:1.0" type="ns4:mod.int.str.myWString10" name="mod.int.str.myWString10" />
   </corba:typeMapping>
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/scopedString" xmlns="http://schemas.apache.org/yoko/idl/scopedString" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopedStruct.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopedStruct.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopedStruct.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopedStruct.wsdl Tue Jun 12 08:25:45 2007
@@ -19,21 +19,21 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/scopedStruct" xmlns:tns="http://schemas.apache.org/yoko/idl/scopedStruct" 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/scopedStruct/typemap">
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/scopedStruct" xmlns="http://schemas.apache.org/yoko/idl/scopedStruct/typemap" repositoryID="IDL:globalStruct:1.0" name="globalStruct" type="ns4:globalStruct">
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/Exception/types" repositoryID="IDL:globalStruct:1.0" type="globalStruct" name="globalStruct">
       <corba:member name="time" idltype="corba:long" />
     </corba:struct>
-    <corba:alias xmlns="http://schemas.apache.org/yoko/idl/scopedStruct/typemap" basetype="corba:short" repositoryID="IDL:var:1.0" name="var" />
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/scopedStruct" xmlns="http://schemas.apache.org/yoko/idl/scopedStruct/typemap" repositoryID="IDL:firstModule/var:1.0" name="firstModule.var" type="ns4:firstModule.var">
+    <corba:alias basetype="corba:short" repositoryID="IDL:var:1.0" name="var" />
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/Exception/types" repositoryID="IDL:firstModule/var:1.0" type="firstModule.var" name="firstModule.var">
       <corba:member name="number" idltype="corba:long" />
     </corba:struct>
-    <corba:struct xmlns:ns4="http://schemas.apache.org/yoko/idl/scopedStruct" xmlns="http://schemas.apache.org/yoko/idl/scopedStruct/typemap" repositoryID="IDL:firstModule/firstInterface/firstStruct:1.0" name="firstModule.firstInterface.firstStruct" type="ns4:firstModule.firstInterface.firstStruct">
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/Exception/types" repositoryID="IDL:firstModule/firstInterface/firstStruct:1.0" type="firstModule.firstInterface.firstStruct" name="firstModule.firstInterface.firstStruct">
       <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/scopedStruct" xmlns="http://schemas.apache.org/yoko/idl/scopedStruct/typemap" repositoryID="IDL:secondModule/secondInterface/secondStruct:1.0" name="secondModule.secondInterface.secondStruct" type="ns4:secondModule.secondInterface.secondStruct">
-      <corba:member name="hour" idltype="globalStruct" />
-      <corba:member name="minute" idltype="firstModule.firstInterface.firstStruct" />
-      <corba:member name="second" idltype="firstModule.firstInterface.firstStruct" />
+    <corba:struct xmlns="http://schemas.apache.org/yoko/idl/Exception/types" repositoryID="IDL:secondModule/secondInterface/secondStruct:1.0" type="secondModule.secondInterface.secondStruct" name="secondModule.secondInterface.secondStruct">
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/scopedStruct/typemap" name="hour" idltype="ns4:globalStruct" />
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/scopedStruct/typemap" name="minute" idltype="ns4:firstModule.firstInterface.firstStruct" />
+      <corba:member xmlns:ns4="http://schemas.apache.org/yoko/idl/scopedStruct/typemap" name="second" idltype="ns4:firstModule.firstInterface.firstStruct" />
       <corba:member name="currency" idltype="corba:string" />
       <corba:member name="praise" idltype="corba:string" />
     </corba:struct>

Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopingObjectRef.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopingObjectRef.wsdl?view=diff&rev=546528&r1=546527&r2=546528
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopingObjectRef.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_scopingObjectRef.wsdl Tue Jun 12 08:25:45 2007
@@ -19,9 +19,9 @@
 -->
 <wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/scopingObjectRef" xmlns:tns="http://schemas.apache.org/yoko/idl/scopingObjectRef" xmlns:wsa="http://www.w3.org/2005/08/addressing" 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/scopingObjectRef/typemap">
-    <corba:object xmlns:ns4="http://www.w3.org/2005/08/addressing" xmlns="http://schemas.apache.org/yoko/idl/scopingObjectRef/typemap" repositoryID="IDL:omg.org/CORBA/Object/1.0" name="CORBA.Object" type="ns4:EndpointReferenceType" />
-    <corba:object xmlns:ns5="http://www.w3.org/2005/08/addressing" xmlns:ns4="http://schemas.apache.org/yoko/idl/scopingObjectRef/typemap" xmlns="http://schemas.apache.org/yoko/idl/scopingObjectRef" binding="TestModule.Test2.TestObjectCORBABinding" repositoryID="IDL:TestModule/Test2/TestObject:1.0" name="ns4:TestModule.Test2.TestObject" type="ns5:EndpointReferenceType" />
-    <corba:object xmlns:ns5="http://www.w3.org/2005/08/addressing" xmlns:ns4="http://schemas.apache.org/yoko/idl/scopingObjectRef/typemap" xmlns="http://schemas.apache.org/yoko/idl/scopingObjectRef" binding="foobar.fooCORBABinding" repositoryID="IDL:foobar/foo:1.0" name="ns4:foobar.foo" type="ns5:EndpointReferenceType" />
+    <corba:object xmlns="http://www.w3.org/2005/08/addressing" repositoryID="IDL:omg.org/CORBA/Object/1.0" type="EndpointReferenceType" name="CORBA.Object" />
+    <corba:object xmlns:ns4="http://www.w3.org/2005/08/addressing" xmlns="http://schemas.apache.org/yoko/idl/scopingObjectRef" binding="TestModule.Test2.TestObjectCORBABinding" repositoryID="IDL:TestModule/Test2/TestObject:1.0" type="ns4:EndpointReferenceType" name="TestModule.Test2.TestObject" />
+    <corba:object xmlns:ns4="http://www.w3.org/2005/08/addressing" xmlns="http://schemas.apache.org/yoko/idl/scopingObjectRef" binding="foobar.fooCORBABinding" repositoryID="IDL:foobar/foo:1.0" type="ns4:EndpointReferenceType" name="foobar.foo" />
   </corba:typeMapping>
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/scopingObjectRef" xmlns="http://schemas.apache.org/yoko/idl/scopingObjectRef" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:xs="http://www.w3.org/2001/XMLSchema">



Mime
View raw message