incubator-yoko-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eno...@apache.org
Subject svn commit: r543457 - in /incubator/yoko/trunk/tools/src: main/java/org/apache/yoko/tools/processors/wsdl/ test/java/org/apache/yoko/tools/processors/ test/resources/idlgen/
Date Fri, 01 Jun 2007 10:56:19 GMT
Author: enolan
Date: Fri Jun  1 03:56:18 2007
New Revision: 543457

URL: http://svn.apache.org/viewvc?view=rev&rev=543457
Log:
Yoko-371 - Wsdltoidl fails to generate correct typemap to support Anonymous Structs.

Modified:
    incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaHelper.java
    incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/WSDLToCorbaBindingTypeTest.java
    incubator/yoko/trunk/tools/src/test/resources/idlgen/TypeInheritance.wsdl
    incubator/yoko/trunk/tools/src/test/resources/idlgen/expected_typeInheritance.idl

Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaHelper.java?view=diff&rev=543457&r1=543456&r2=543457
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaHelper.java
(original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaHelper.java
Fri Jun  1 03:56:18 2007
@@ -183,15 +183,24 @@
                 
                 MemberType member = new MemberType(); 
                 member.setName(memberType.getName() + "_f");
-                member.setIdltype(typeName);
-                members.add(member);
 
+                // create an anonymous sequence if its a sequence within a sequence.
+                if (particle instanceof XmlSchemaSequence) {
+                    QName name = createQNameCorbaNamespace(typeName.getLocalPart() + "_anon");
+                    CorbaTypeImpl anonSeq = WSDLTypes.mapToSequence(name, schemaTypeName,
typeName, 0, true);
+                    if (anonSeq  != null && !isDuplicate(anonSeq)) {
+                        member.setIdltype(anonSeq.getQName());
+                        anonSeq.setQName(null);
+                        typeMappingType.getStructOrExceptionOrUnion().add(anonSeq);
+                    }                
+                } else {                
+                    member.setIdltype(typeName);
+                }                
+                members.add(member);
             } else if (container instanceof XmlSchemaChoice) {
                 XmlSchemaChoice choice = (XmlSchemaChoice)container;
-                CorbaTypeImpl corbatype = processChoice(choice, defaultName, schemaTypeName);
-                MemberType member = new MemberType(); 
-                member.setName(corbatype.getQName().getLocalPart());
-                member.setIdltype(corbatype.getQName());
+                MemberType member = processChoiceMember(choice, defaultName, 
+                                                        schemaTypeName);
                 members.add(member);
             } else if (container instanceof XmlSchemaAll) {
                 XmlSchemaAll all = (XmlSchemaAll)container;
@@ -220,6 +229,17 @@
         }
         return members;
     }
+
+    private MemberType processChoiceMember(XmlSchemaChoice choice, QName defaultName,
+        QName schemaTypeName) throws Exception {
+    
+        CorbaTypeImpl corbatype = processChoice(choice, defaultName, schemaTypeName);
+        MemberType member = new MemberType(); 
+        member.setName(corbatype.getQName().getLocalPart());
+        member.setIdltype(corbatype.getQName());
+        return member;
+    }
+    
     
     private CorbaTypeImpl processChoice(XmlSchemaChoice choice,
                                         QName defaultName, 

Modified: incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/WSDLToCorbaBindingTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/WSDLToCorbaBindingTypeTest.java?view=diff&rev=543457&r1=543456&r2=543457
==============================================================================
--- incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/WSDLToCorbaBindingTypeTest.java
(original)
+++ incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/WSDLToCorbaBindingTypeTest.java
Fri Jun  1 03:56:18 2007
@@ -400,13 +400,19 @@
             idlgen.setOutputFile("typeInherit.idl");
             idlgen.generateIDL(model);
 
-            Anonstring str = (Anonstring)mapType.getStructOrExceptionOrUnion().get(6);
+            Anonsequence anonseq = (Anonsequence)mapType.getStructOrExceptionOrUnion().get(1);
+            assertEquals("Name is incorrect for AnonSequence Type", "Type5SequenceStruct_anon",

+                         anonseq.getName());
+            assertEquals("Type is incorrect for AnonSequence Type", "Type5", 
+                    anonseq.getType().getLocalPart());            
+           
+            Anonstring str = (Anonstring)mapType.getStructOrExceptionOrUnion().get(7);
             assertEquals("Name is incorrect for AnonString Type", "attrib2Type", 
                          str.getName());
             assertEquals("Type is incorrect for AnonString Type", "string", 
                          str.getType().getLocalPart());            
 
-            Union un = (Union)mapType.getStructOrExceptionOrUnion().get(7);
+            Union un = (Union)mapType.getStructOrExceptionOrUnion().get(8);
             assertEquals("Name is incorrect for Union Type", "attrib2Type_nil", 
                          un.getName());
             assertEquals("Type is incorrect for Union Type", "attrib2", 

Modified: incubator/yoko/trunk/tools/src/test/resources/idlgen/TypeInheritance.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idlgen/TypeInheritance.wsdl?view=diff&rev=543457&r1=543456&r2=543457
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idlgen/TypeInheritance.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idlgen/TypeInheritance.wsdl Fri Jun  1 03:56:18
2007
@@ -18,100 +18,101 @@
  * under the License.
 -->
 <definitions name="SoapInteropCompound" targetNamespace="http://soapinterop.org/" xmlns:typens="http://soapinterop.org/xsd"
xmlns:corba="http://schemas.apache.org/yoko/bindings/corba" xmlns:ns1="http://soapinterop.org/corba/typemap/"
xmlns:wsdlns="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <corba:typeMapping targetNamespace="http://soapinterop.org/corba/typemap/">
+  <corba:typeMapping xmlns:ns3="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://soapinterop.org/corba/typemap/">
     <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:Type5SequenceStruct:1.0"
type="typens:Type5" name="Type5SequenceStruct">
       <corba:member name="varInt" idltype="corba:long" />
       <corba:member name="varString" idltype="corba:string" />
     </corba:struct>
-      <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:Type5:1.0"
type="typens:Type5" name="Type5">
-        <corba:member name="varFloat" idltype="corba:float" />
-        <corba:member name="Type5SequenceStruct_f" idltype="typens:Type5SequenceStruct"
/>
-      </corba:struct>
-        <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:Type4AllStruct:1.0"
type="typens:Type4" name="Type4AllStruct">
-          <corba:member name="varStringExt" idltype="corba:string" />
-          <corba:member name="varFloatExt" idltype="corba:float" />
-        </corba:struct>
-          <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:Type4:1.0"
type="typens:Type4" name="Type4">
-            <corba:member name="anyType_f" idltype="corba:any" />
-            <corba:member name="AttrString" idltype="corba:string" />
-            <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/" name="Type4AllStruct_f"
idltype="ns1:Type4AllStruct" />
-          </corba:struct>
-            <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:base:1.0"
type="typens:base" name="base">
-              <corba:member name="attr1" idltype="corba:string" />
-              <corba:member name="attr2" idltype="corba:long" />
-              <corba:member name="e1" idltype="corba:long" />
-              <corba:member name="e2" idltype="corba:string" />
-            </corba:struct>
-              <corba:union xmlns:ns3="http://soapinterop.org/xsd" discriminator="corba:boolean"
repositoryID="IDL:long_nil:1.0" type="ns3:attrib1" name="long_nil">
-                <corba:unionbranch name="value" idltype="corba:long" default="false">
-                  <corba:case label="TRUE" />
-                </corba:unionbranch>
-                </corba:union>
-                  <corba:anonstring bound="2" type="corba:string" name="attrib2Type" />
-                  <corba:union xmlns:ns3="http://soapinterop.org/xsd" discriminator="corba:boolean"
repositoryID="IDL:attrib2Type_nil:1.0" type="ns3:attrib2" name="attrib2Type_nil">
-                    <corba:unionbranch xmlns:ns1="http://soapinterop.org/corba/typemap/"
name="value" idltype="ns1:attrib2Type" default="false">
-                      <corba:case label="TRUE" />
-                    </corba:unionbranch>
-                    </corba:union>
-                      <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:Type6:1.0"
type="typens:Type6" name="Type6">
-                        <corba:member xmlns:xs="http://www.w3.org/2001/XMLSchema" name="_simpleTypeValue"
idltype="xs:short" />
-                        <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/"
name="attrib1" idltype="ns1:long_nil" />
-                        <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/"
name="attrib2" idltype="ns1:attrib2Type_nil" />
-                      </corba:struct>
-                        <corba:union xmlns:typens="http://soapinterop.org/xsd" discriminator="corba:long"
repositoryID="IDL:sub2ChoiceType:1.0" type="typens:sub2" name="sub2ChoiceType">
-                          <corba:unionbranch name="e4" idltype="corba:double" default="false">
-                            <corba:case label="0" />
-                          </corba:unionbranch>
-                            <corba:unionbranch name="e6" idltype="corba:double" default="false">
-                              <corba:case label="1" />
-                            </corba:unionbranch>
-                            </corba:union>
-                              <corba:struct xmlns:typens="http://soapinterop.org/xsd"
repositoryID="IDL:sub2:1.0" type="typens:sub2" name="sub2">
-                                <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/"
name="base_f" idltype="ns1:base" />
-                                <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/"
name="sub2ChoiceType_f" idltype="ns1:sub2ChoiceType" />
-                              </corba:struct>
-                                <corba:struct xmlns:typens="http://soapinterop.org/xsd"
repositoryID="IDL:Type2SequenceStruct:1.0" type="typens:Type2" name="Type2SequenceStruct">
-                                  <corba:member name="varFloat" idltype="corba:float"
/>
-                                </corba:struct>
-                                  <corba:struct xmlns:typens="http://soapinterop.org/xsd"
repositoryID="IDL:Type2:1.0" type="typens:Type2" name="Type2">
-                                    <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/"
name="SimpleStruct_f" idltype="ns1:SimpleStruct" />
-                                    <corba:member name="attrString1" idltype="corba:string"
/>
-                                    <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/"
name="Type2SequenceStruct_f" idltype="ns1:Type2SequenceStruct" />
-                                    <corba:member name="attrString2" idltype="corba:string"
/>
-                                  </corba:struct>
-                                    <corba:struct xmlns:typens="http://soapinterop.org/xsd"
repositoryID="IDL:sub3SequenceStruct:1.0" type="typens:sub3" name="sub3SequenceStruct">
-                                      <corba:member name="e5" idltype="corba:boolean"
/>
-                                    </corba:struct>
-                                      <corba:struct xmlns:typens="http://soapinterop.org/xsd"
repositoryID="IDL:sub3:1.0" type="typens:sub3" name="sub3">
-                                        <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/"
name="sub2_f" idltype="ns1:sub2" />
-                                        <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/"
name="sub3SequenceStruct_f" idltype="ns1:sub3SequenceStruct" />
-                                      </corba:struct>
-                                        <corba:struct xmlns:typens="http://soapinterop.org/xsd"
repositoryID="IDL:Type3:1.0" type="typens:Type3" name="Type3">
-                                          <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/"
name="SimpleStruct_f" idltype="ns1:SimpleStruct" />
-                                          <corba:member name="attrString" idltype="corba:string"
/>
-                                        </corba:struct>
-                                          <corba:struct xmlns:typens="http://soapinterop.org/xsd"
repositoryID="IDL:Type1SequenceStruct:1.0" type="typens:Type1" name="Type1SequenceStruct">
-                                            <corba:member name="varString" idltype="corba:long"
/>
-                                            <corba:member name="varFloat" idltype="corba:float"
/>
-                                          </corba:struct>
-                                            <corba:struct xmlns:typens="http://soapinterop.org/xsd"
repositoryID="IDL:Type1:1.0" type="typens:Type1" name="Type1">
-                                              <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/"
name="SimpleStruct_f" idltype="ns1:SimpleStruct" />
-                                              <corba:member name="attrString" idltype="corba:string"
/>
-                                              <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/"
name="Type1SequenceStruct_f" idltype="ns1:Type1SequenceStruct" />
-                                            </corba:struct>
-                                              <corba:struct xmlns:typens="http://soapinterop.org/xsd"
repositoryID="IDL:SimpleStruct:1.0" type="typens:SimpleStruct" name="SimpleStruct">
-                                                <corba:member name="varFloat" idltype="corba:float"
/>
-                                                <corba:member name="varInt" idltype="corba:long"
/>
-                                                <corba:member name="varString" idltype="corba:string"
/>
-                                              </corba:struct>
-                                                <corba:struct xmlns:typens="http://soapinterop.org/xsd"
repositoryID="IDL:sub1SequenceStruct:1.0" type="typens:sub1" name="sub1SequenceStruct">
-                                                  <corba:member name="e3" idltype="corba:float"
/>
-                                                </corba:struct>
-                                                  <corba:struct xmlns:typens="http://soapinterop.org/xsd"
repositoryID="IDL:sub1:1.0" type="typens:sub1" name="sub1">
-                                                    <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/"
name="base_f" idltype="ns1:base" />
-                                                    <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/"
name="sub1SequenceStruct_f" idltype="ns1:sub1SequenceStruct" />
-                                                  </corba:struct>
-                                                  </corba:typeMapping>
+    <corba:anonsequence xmlns:typens="http://soapinterop.org/xsd" xmlns:ns1="http://soapinterop.org/corba/typemap/"
elemtype="ns1:Type5SequenceStruct" bound="0" type="typens:Type5" name="Type5SequenceStruct_anon"
/>
+    <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:Type5:1.0"
type="typens:Type5" name="Type5">
+      <corba:member name="varFloat" idltype="corba:float" />
+      <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/" name="Type5SequenceStruct_f"
idltype="ns1:Type5SequenceStruct_anon" />
+    </corba:struct>
+    <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:Type4AllStruct:1.0"
type="typens:Type4" name="Type4AllStruct">
+      <corba:member name="varStringExt" idltype="corba:string" />
+      <corba:member name="varFloatExt" idltype="corba:float" />
+    </corba:struct>
+    <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:Type4:1.0"
type="typens:Type4" name="Type4">
+      <corba:member name="anyType_f" idltype="corba:any" />
+      <corba:member name="AttrString" idltype="corba:string" />
+      <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/" name="Type4AllStruct_f"
idltype="ns1:Type4AllStruct" />
+    </corba:struct>
+    <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:base:1.0"
type="typens:base" name="base">
+      <corba:member name="attr1" idltype="corba:string" />
+      <corba:member name="attr2" idltype="corba:long" />
+      <corba:member name="e1" idltype="corba:long" />
+      <corba:member name="e2" idltype="corba:string" />
+    </corba:struct>
+    <corba:union xmlns="" xmlns:ns4="http://schemas.xmlsoap.org/wsdl/" discriminator="corba:boolean"
repositoryID="IDL:long_nil:1.0" type="attrib1" name="long_nil">
+      <corba:unionbranch name="value" idltype="corba:long" default="false">
+        <corba:case label="TRUE" />
+      </corba:unionbranch>
+    </corba:union>
+    <corba:anonstring bound="2" type="corba:string" name="attrib2Type" />
+    <corba:union xmlns="" xmlns:ns4="http://schemas.xmlsoap.org/wsdl/" discriminator="corba:boolean"
repositoryID="IDL:attrib2Type_nil:1.0" type="attrib2" name="attrib2Type_nil">
+      <corba:unionbranch xmlns:ns1="http://soapinterop.org/corba/typemap/" name="value"
idltype="ns1:attrib2Type" default="false">
+        <corba:case label="TRUE" />
+      </corba:unionbranch>
+    </corba:union>
+    <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:Type6:1.0"
type="typens:Type6" name="Type6">
+      <corba:member xmlns:xs="http://www.w3.org/2001/XMLSchema" name="_simpleTypeValue"
idltype="xs:short" />
+      <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/" name="attrib1" idltype="ns1:long_nil"
/>
+      <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/" name="attrib2" idltype="ns1:attrib2Type_nil"
/>
+    </corba:struct>
+    <corba:union xmlns:typens="http://soapinterop.org/xsd" discriminator="corba:long"
repositoryID="IDL:sub2ChoiceType:1.0" type="typens:sub2" name="sub2ChoiceType">
+      <corba:unionbranch name="e4" idltype="corba:double" default="false">
+        <corba:case label="0" />
+      </corba:unionbranch>
+      <corba:unionbranch name="e6" idltype="corba:double" default="false">
+        <corba:case label="1" />
+      </corba:unionbranch>
+    </corba:union>
+    <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:sub2:1.0"
type="typens:sub2" name="sub2">
+      <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/" name="base_f" idltype="ns1:base"
/>
+      <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/" name="sub2ChoiceType_f"
idltype="ns1:sub2ChoiceType" />
+    </corba:struct>
+    <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:Type2SequenceStruct:1.0"
type="typens:Type2" name="Type2SequenceStruct">
+      <corba:member name="varFloat" idltype="corba:float" />
+    </corba:struct>
+    <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:Type2:1.0"
type="typens:Type2" name="Type2">
+      <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/" name="SimpleStruct_f"
idltype="ns1:SimpleStruct" />
+      <corba:member name="attrString1" idltype="corba:string" />
+      <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/" name="Type2SequenceStruct_f"
idltype="ns1:Type2SequenceStruct" />
+      <corba:member name="attrString2" idltype="corba:string" />
+    </corba:struct>
+    <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:sub3SequenceStruct:1.0"
type="typens:sub3" name="sub3SequenceStruct">
+      <corba:member name="e5" idltype="corba:boolean" />
+    </corba:struct>
+    <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:sub3:1.0"
type="typens:sub3" name="sub3">
+      <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/" name="sub2_f" idltype="ns1:sub2"
/>
+      <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/" name="sub3SequenceStruct_f"
idltype="ns1:sub3SequenceStruct" />
+    </corba:struct>
+    <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:Type3:1.0"
type="typens:Type3" name="Type3">
+      <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/" name="SimpleStruct_f"
idltype="ns1:SimpleStruct" />
+      <corba:member name="attrString" idltype="corba:string" />
+    </corba:struct>
+    <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:Type1SequenceStruct:1.0"
type="typens:Type1" name="Type1SequenceStruct">
+      <corba:member name="varString" idltype="corba:long" />
+      <corba:member name="varFloat" idltype="corba:float" />
+    </corba:struct>
+    <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:Type1:1.0"
type="typens:Type1" name="Type1">
+      <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/" name="SimpleStruct_f"
idltype="ns1:SimpleStruct" />
+      <corba:member name="attrString" idltype="corba:string" />
+      <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/" name="Type1SequenceStruct_f"
idltype="ns1:Type1SequenceStruct" />
+    </corba:struct>
+    <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:SimpleStruct:1.0"
type="typens:SimpleStruct" name="SimpleStruct">
+      <corba:member name="varFloat" idltype="corba:float" />
+      <corba:member name="varInt" idltype="corba:long" />
+      <corba:member name="varString" idltype="corba:string" />
+    </corba:struct>
+    <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:sub1SequenceStruct:1.0"
type="typens:sub1" name="sub1SequenceStruct">
+      <corba:member name="e3" idltype="corba:float" />
+    </corba:struct>
+    <corba:struct xmlns:typens="http://soapinterop.org/xsd" repositoryID="IDL:sub1:1.0"
type="typens:sub1" name="sub1">
+      <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/" name="base_f" idltype="ns1:base"
/>
+      <corba:member xmlns:ns1="http://soapinterop.org/corba/typemap/" name="sub1SequenceStruct_f"
idltype="ns1:sub1SequenceStruct" />
+    </corba:struct>
+  </corba:typeMapping>
   <types>
     <schema elementFormDefault="qualified" targetNamespace="http://soapinterop.org/xsd"
xmlns="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
             <element name="in_obj" type="typens:base"/>
@@ -243,41 +244,53 @@
         </schema>
   </types>
   <message name="echoObjectResponse">
-    <part name="Result" element="typens:result_obj"/>
+    <part name="Result" element="typens:result_obj">
+    </part>
   </message>
   <message name="echoObject">
-    <part name="x" element="typens:in_obj"/>
+    <part name="x" element="typens:in_obj">
+    </part>
   </message>
   <message name="echoObject3Response">
-    <part name="Result" element="typens:result_obj3"/>
+    <part name="Result" element="typens:result_obj3">
+    </part>
   </message>
   <message name="echoObject2Response">
-    <part name="Result" element="typens:result_obj2"/>
+    <part name="Result" element="typens:result_obj2">
+    </part>
   </message>
   <message name="echoObject2">
-    <part name="x" element="typens:in_obj2"/>
+    <part name="x" element="typens:in_obj2">
+    </part>
   </message>
   <message name="echoObject3">
-    <part name="x" element="typens:in_obj3"/>
+    <part name="x" element="typens:in_obj3">
+    </part>
   </message>
   <portType name="TypeInheritancePortType">
     <operation name="echoObject" parameterOrder="x">
-      <input name="echoObject" message="wsdlns:echoObject"/>
-      <output name="echoObjectResponse" message="wsdlns:echoObjectResponse"/>
+      <input name="echoObject" message="wsdlns:echoObject">
+    </input>
+      <output name="echoObjectResponse" message="wsdlns:echoObjectResponse">
+    </output>
     </operation>
     <operation name="echoObject2" parameterOrder="x">
-      <input name="echoObject2" message="wsdlns:echoObject2"/>
-      <output name="echoObject2Response" message="wsdlns:echoObject2Response"/>
+      <input name="echoObject2" message="wsdlns:echoObject2">
+    </input>
+      <output name="echoObject2Response" message="wsdlns:echoObject2Response">
+    </output>
     </operation>
     <operation name="echoObject3" parameterOrder="x">
-      <input name="echoObject3" message="wsdlns:echoObject3"/>
-      <output name="echoObject3Response" message="wsdlns:echoObject3Response"/>
+      <input name="echoObject3" message="wsdlns:echoObject3">
+    </input>
+      <output name="echoObject3Response" message="wsdlns:echoObject3Response">
+    </output>
     </operation>
   </portType>
   <binding name="TypeInheritanceCORBABinding" type="wsdlns:TypeInheritancePortType">
-    <corba:binding repositoryID="IDL:TypeInheritancePortType:1.0" />
+    <corba:binding xmlns:ns3="http://schemas.xmlsoap.org/wsdl/" repositoryID="IDL:TypeInheritancePortType:1.0"
/>
     <operation name="echoObject">
-      <corba:operation name="echoObject">
+      <corba:operation xmlns:ns3="http://schemas.xmlsoap.org/wsdl/" name="echoObject">
         <corba:param xmlns:ns1="http://soapinterop.org/corba/typemap/" mode="in" name="x"
idltype="ns1:base" />
         <corba:return xmlns:ns1="http://soapinterop.org/corba/typemap/" name="Result"
idltype="ns1:base" />
       </corba:operation>
@@ -287,7 +300,7 @@
       </output>
     </operation>
     <operation name="echoObject2">
-      <corba:operation name="echoObject2">
+      <corba:operation xmlns:ns3="http://schemas.xmlsoap.org/wsdl/" name="echoObject2">
         <corba:param xmlns:ns1="http://soapinterop.org/corba/typemap/" mode="in" name="x"
idltype="ns1:sub1" />
         <corba:return xmlns:ns1="http://soapinterop.org/corba/typemap/" name="Result"
idltype="ns1:sub2" />
       </corba:operation>
@@ -297,7 +310,7 @@
       </output>
     </operation>
     <operation name="echoObject3">
-      <corba:operation name="echoObject3">
+      <corba:operation xmlns:ns3="http://schemas.xmlsoap.org/wsdl/" name="echoObject3">
         <corba:param xmlns:ns1="http://soapinterop.org/corba/typemap/" mode="in" name="x"
idltype="ns1:sub3" />
         <corba:return xmlns:ns1="http://soapinterop.org/corba/typemap/" name="Result"
idltype="ns1:sub2" />
       </corba:operation>
@@ -307,4 +320,9 @@
       </output>
     </operation>
   </binding>
+  <service name="TypeInheritanceCORBAService">
+    <port name="TypeInheritanceCORBAPort" binding="wsdlns:TypeInheritanceCORBABinding">
+      <corba:address xmlns:ns3="http://schemas.xmlsoap.org/wsdl/" location="file:./TypeInheritance.ref"
/>
+    </port>
+  </service>
 </definitions>

Modified: incubator/yoko/trunk/tools/src/test/resources/idlgen/expected_typeInheritance.idl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idlgen/expected_typeInheritance.idl?view=diff&rev=543457&r1=543456&r2=543457
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idlgen/expected_typeInheritance.idl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idlgen/expected_typeInheritance.idl Fri
Jun  1 03:56:18 2007
@@ -22,7 +22,7 @@
 };
 struct Type5 {
     float varFloat;
-    Type5SequenceStruct Type5SequenceStruct_f;
+    sequence<Type5SequenceStruct>  Type5SequenceStruct_f;
 };
 struct Type4AllStruct {
     string varStringExt;



Mime
View raw message