Author: enolan
Date: Tue Jun  5 09:03:09 2007
New Revision: 544533

URL: http://svn.apache.org/viewvc?view=rev&rev=544533
Log:
Yoko-378 wsdltoidl tool can't create exception when complextype has no name.

Added:
    incubator/yoko/trunk/tools/src/test/resources/idlgen/databaseService.wsdl   
(with props)
    
incubator/yoko/trunk/tools/src/test/resources/idlgen/expected_databaseService.idl
    incubator/yoko/trunk/tools/src/test/resources/wsdl/databaseService.wsdl   
(with props)
Modified:
    
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java
    
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/java/org/apache/yoko/tools/processors/WSDLToIDLGenerationTest.java
    incubator/yoko/trunk/tools/src/test/resources/idlgen/TypeInheritance.wsdl
    
incubator/yoko/trunk/tools/src/test/resources/idlgen/expected_typeInheritance.idl
    incubator/yoko/trunk/tools/src/test/resources/wsdl/TypeInheritance.wsdl

Modified: 
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java
URL: 
http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java?view=diff&rev=544533&r1=544532&r2=544533
==============================================================================
--- 
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java
 (original)
+++ 
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java
 Tue Jun  5 09:03:09 2007
@@ -641,7 +641,7 @@
                 }
             } else {
                 QName elementName = part.getElementName();
-                QName schematypeName = 
helper.checkPrefix(schemaType.getQName());
+                QName schematypeName = 
helper.checkPrefix(schemaType.getQName());                
                 corbaex = createCorbaException(name, schematypeName, 
schemaType, elementName);
             }
         } else {            
@@ -691,8 +691,13 @@
             complex = (XmlSchemaComplexType)stype;
             corbaex = new org.apache.schemas.yoko.bindings.corba.Exception();
             corbaex.setName(name.getLocalPart());
-            corbaex.setQName(schemaTypeName);
-            corbaex.setType(helper.checkPrefix(stype.getQName()));
+            if (schemaTypeName != null) {
+                corbaex.setQName(schemaTypeName);
+                corbaex.setType(helper.checkPrefix(stype.getQName()));
+            } else {
+                corbaex.setQName(helper.checkPrefix(elementName));
+                corbaex.setType(helper.checkPrefix(elementName));
+            }            
             corbaex.setRepositoryID(helper.REPO_STRING + "/" + 
name.getLocalPart() + helper.IDL_VERSION);
             
             List attributeMembers = 
helper.processAttributesAsMembers(complex.getAttributes().getIterator());

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=544533&r1=544532&r2=544533
==============================================================================
--- 
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
 Tue Jun  5 09:03:09 2007
@@ -184,21 +184,8 @@
                 }
                 
                 MemberType member = new MemberType(); 
-                member.setName(memberType.getName() + "_f");
-                
-                //REVISIT Causing failures in the tests.
-                // 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);
-                //}                
+                member.setName(memberType.getName() + "_f");                   
                        
+                member.setIdltype(typeName);                               
                 members.add(member);
             } else if (container instanceof XmlSchemaChoice) {
                 XmlSchemaChoice choice = (XmlSchemaChoice)container;

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=544533&r1=544532&r2=544533
==============================================================================
--- 
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
 Tue Jun  5 09:03:09 2007
@@ -377,7 +377,7 @@
     
     
     // tests Type Inheritance and attributes.
-    /*public void testTypeInheritance() throws Exception {
+    public void testTypeInheritance() throws Exception {
         
         try {
             String fileName = 
getClass().getResource("/wsdl/TypeInheritance.wsdl").toString();
@@ -400,19 +400,19 @@
             idlgen.setOutputFile("typeInherit.idl");
             idlgen.generateIDL(model);
 
-            Anonsequence anonseq = 
(Anonsequence)mapType.getStructOrExceptionOrUnion().get(1);
-            assertEquals("Name is incorrect for AnonSequence Type", 
"Type5SequenceStruct_anon", 
-                         anonseq.getName());
+            Struct structType = 
(Struct)mapType.getStructOrExceptionOrUnion().get(0);
+            assertEquals("Name is incorrect for Struct Type", 
"Type5SequenceStruct", 
+                         structType.getName());
             assertEquals("Type is incorrect for AnonSequence Type", "Type5", 
-                    anonseq.getType().getLocalPart());            
+                    structType.getType().getLocalPart());            
            
-            Anonstring str = 
(Anonstring)mapType.getStructOrExceptionOrUnion().get(7);
+            Anonstring str = 
(Anonstring)mapType.getStructOrExceptionOrUnion().get(6);
             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(8);
+            Union un = (Union)mapType.getStructOrExceptionOrUnion().get(7);
             assertEquals("Name is incorrect for Union Type", 
"attrib2Type_nil", 
                          un.getName());
             assertEquals("Type is incorrect for Union Type", "attrib2", 
@@ -428,7 +428,7 @@
         } finally {
             new File("typeInherit.idl").deleteOnExit();
         }
-    } */   
+    }    
     
     // tests anonymous strings and fixed types.
     public void testAnonFixedType() throws Exception {
@@ -635,7 +635,26 @@
         } finally {
             new File("complex_types-corba.wsdl").deleteOnExit();
         }
+    }
+    
+    public void testCorbaExceptionComplextype() throws Exception {
+        
+        try {
+            String fileName = 
getClass().getResource("/wsdl/databaseService.wsdl").toString();
+            generator.setWsdlFile(fileName);
+            generator.addInterfaceName("Database");
+
+            Definition model = generator.generateCORBABinding();
+            Document document = writer.getDocument(model);
+            Element typemap = getElementNode(document, "corba:typeMapping");   
         
+            assertNotNull(typemap);            
+            assertEquals(2, 
typemap.getElementsByTagName("corba:struct").getLength());
+            assertEquals(1, 
typemap.getElementsByTagName("corba:exception").getLength());           
+            assertEquals(1, 
typemap.getElementsByTagName("corba:anonsequence").getLength());
+        } finally {
+            new File("databaseService-corba.wsdl").deleteOnExit();
+        }
     }    
 
-    
+        
 }

Modified: 
incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/WSDLToIDLGenerationTest.java
URL: 
http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/WSDLToIDLGenerationTest.java?view=diff&rev=544533&r1=544532&r2=544533
==============================================================================
--- 
incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/WSDLToIDLGenerationTest.java
 (original)
+++ 
incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/WSDLToIDLGenerationTest.java
 Tue Jun  5 09:03:09 2007
@@ -690,6 +690,27 @@
         }
     }
 
+    
+    public void testCorbaExceptionComplexType() throws Exception {
+        
+        try {
+            String fileName = 
getClass().getResource("/idlgen/databaseService.wsdl").toString();
+            idlgen.setWsdlFile(fileName);
+            
+            idlgen.setBindingName("DatabaseCORBABinding");
+            idlgen.setOutputFile("databaseService.idl");            
+            idlgen.setPrintWriter(new PrintWriter(idloutput));
+            idlgen.generateIDL(null);
+
+            InputStream origstream = 
getClass().getResourceAsStream("/idlgen/expected_databaseService.idl");
+            byte orig[] = inputStreamToBytes(origstream);
+
+            checkIDLStrings(orig, idloutput.toByteArray());
+        } finally {
+            new File("databaseService.idl").deleteOnExit();
+        }
+    }
+
 
 
 

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=544533&r1=544532&r2=544533
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idlgen/TypeInheritance.wsdl 
(original)
+++ incubator/yoko/trunk/tools/src/test/resources/idlgen/TypeInheritance.wsdl 
Tue Jun  5 09:03:09 2007
@@ -23,10 +23,9 @@
       <corba:member name="varInt" idltype="corba:long" />
       <corba:member name="varString" idltype="corba:string" />
     </corba:struct>
-    <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:member xmlns:ns1="http://soapinterop.org/corba/typemap/"; 
name="Type5SequenceStruct_f" idltype="ns1: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" />
@@ -55,7 +54,7 @@
       </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 name="_simpleTypeValue" idltype="corba: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>
@@ -211,7 +210,7 @@
                         </all>
                     </extension>
                 </complexContent>
-            </complexType>
+            </complexType> 
 
             <complexType name="Type5">
                 <sequence>

Added: incubator/yoko/trunk/tools/src/test/resources/idlgen/databaseService.wsdl
URL: 
http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idlgen/databaseService.wsdl?view=auto&rev=544533
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idlgen/databaseService.wsdl 
(added)
+++ incubator/yoko/trunk/tools/src/test/resources/idlgen/databaseService.wsdl 
Tue Jun  5 09:03:09 2007
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<wsdl:definitions name="DatabaseService" 
targetNamespace="http://schemas.apache.org/dbservice"; 
xmlns:corba="http://schemas.apache.org/yoko/bindings/corba"; 
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"; 
xmlns:ns1="http://schemas.apache.org/dbservice"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:ns3="http:/schemas.apache.org/dbservice/typemap" 
xmlns:ns2="http://schemas.xmlsoap.org/wsdl/http"; 
xmlns:soap="http://schemas.xmlsoap.org/soap/"; 
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";>
+  <corba:typeMapping 
targetNamespace="http:/schemas.apache.org/dbservice/typemap">
+    <corba:struct xmlns:ns1="http://schemas.apache.org/dbservice"; 
repositoryID="IDL:getNameResponseResultList1Type:1.0" 
type="ns1:getNameResponseResultList1Type" name="getNameResponseResultList1Type">
+      <corba:member name="NAME" idltype="corba:string" />
+    </corba:struct>
+    <corba:struct xmlns:ns1="http://schemas.apache.org/dbservice"; 
repositoryID="IDL:getName:1.0" type="ns1:getName" name="getName">
+      <corba:member name="Parameter1" idltype="corba:long" />
+    </corba:struct>
+    <corba:anonsequence xmlns:ns1="http://schemas.apache.org/dbservice"; 
xmlns:ns3="http:/schemas.apache.org/dbservice/typemap" 
elemtype="ns3:getNameResponseResultList1Type" bound="0" 
type="ns1:getNameResponse" name="getNameResponseType" />
+    <corba:exception xmlns:ns1="http://schemas.apache.org/dbservice"; 
repositoryID="IDL:getNameFault:1.0" type="ns1:getNameFault" name="getNameFault">
+      <corba:member name="message" idltype="corba:string" />
+      <corba:member name="category" idltype="corba:string" />
+    </corba:exception>
+  </corba:typeMapping>
+  <wsdl:types>
+    <xsd:schema targetNamespace="http://schemas.apache.org/dbservice"; 
xmlns="http://schemas.apache.org/dbservice";>
+<xsd:element name="getName">
+<xsd:complexType>
+<xsd:sequence>
+<xsd:element name="Parameter1" nillable="false" type="xsd:int"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:element>
+<xsd:element name="getNameResponse">
+<xsd:complexType>
+<xsd:sequence>
+<xsd:element maxOccurs="unbounded" minOccurs="0" name="ResultList1" 
type="getNameResponseResultList1Type"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:element>
+<xsd:complexType name="getNameResponseResultList1Type">
+<xsd:sequence>
+<xsd:element name="NAME" nillable="false" type="xsd:string"/>
+</xsd:sequence>
+</xsd:complexType>
+<xsd:element name="getNameFault">
+<xsd:complexType>
+<xsd:sequence>
+<xsd:element name="message" type="xsd:string"/>
+<xsd:element name="category" type="xsd:string"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:element>
+</xsd:schema>
+  </wsdl:types>
+  <wsdl:message name="getNameFault">
+    <wsdl:part name="getNameFault" element="ns1:getNameFault">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getName">
+    <wsdl:part name="getName" element="ns1:getName">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getNameResponse">
+    <wsdl:part name="getNameResponse" element="ns1:getNameResponse">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:portType name="Database">
+    <wsdl:operation name="getName">
+      <wsdl:input name="getName" message="ns1:getName">
+    </wsdl:input>
+      <wsdl:output name="getNameResponse" message="ns1:getNameResponse">
+    </wsdl:output>
+      <wsdl:fault name="getNameFault" message="ns1:getNameFault">
+    </wsdl:fault>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="DBServiceSoapBinding" type="ns1:Database">
+    <wsdlsoap:binding style="document" 
transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="getName">
+    <wsdlsoap:operation style="document"/>
+      <wsdl:input name="getName">
+    <wsdlsoap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="getNameResponse">
+    <wsdlsoap:body use="literal"/>
+      </wsdl:output>
+      <wsdl:fault name="getNameFault">
+    <wsdlsoap:fault name="soapFault" use="literal"/>
+      </wsdl:fault>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:binding name="DatabaseCORBABinding" type="ns1:Database">
+    <corba:binding repositoryID="IDL:Database:1.0" />
+    <wsdl:operation name="getName">
+      <corba:operation name="getName">
+        <corba:param mode="in" name="Parameter1" idltype="corba:long" />
+        <corba:return xmlns:ns3="http:/schemas.apache.org/dbservice/typemap" 
name="ResultList1" idltype="ns3:getNameResponseResultList1Type" />
+        <corba:raises xmlns:ns3="http:/schemas.apache.org/dbservice/typemap" 
exception="ns3:getNameFault" />
+      </corba:operation>
+      <wsdl:input name="getName">
+      </wsdl:input>
+      <wsdl:output name="getNameResponse">
+      </wsdl:output>
+      <wsdl:fault name="getNameFault">
+      </wsdl:fault>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="DatabaseService">
+    <wsdl:port name="DatabaseSoapPort" binding="ns1:DBServiceSoapBinding">
+    <wsdlsoap:address location="http://localhost:9000/dbservice"/>
+    </wsdl:port>
+  </wsdl:service>
+  <wsdl:service name="DatabaseCORBAService">
+    <wsdl:port name="DatabaseCORBAPort" binding="ns1:DatabaseCORBABinding">
+      <corba:address location="file:./Database.ref" />
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>

Propchange: 
incubator/yoko/trunk/tools/src/test/resources/idlgen/databaseService.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
incubator/yoko/trunk/tools/src/test/resources/idlgen/databaseService.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: 
incubator/yoko/trunk/tools/src/test/resources/idlgen/databaseService.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: 
incubator/yoko/trunk/tools/src/test/resources/idlgen/expected_databaseService.idl
URL: 
http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idlgen/expected_databaseService.idl?view=auto&rev=544533
==============================================================================
--- 
incubator/yoko/trunk/tools/src/test/resources/idlgen/expected_databaseService.idl
 (added)
+++ 
incubator/yoko/trunk/tools/src/test/resources/idlgen/expected_databaseService.idl
 Tue Jun  5 09:03:09 2007
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+struct getNameResponseResultList1Type {
+    string NAME;
+};
+struct getName {
+    long Parameter1;
+};
+exception getNameFault {
+    string message;
+    string category;
+};
+interface Database {
+    ::getNameResponseResultList1Type
+    getName(
+        in long Parameter1
+    ) raises(
+        ::getNameFault
+    );
+};

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=544533&r1=544532&r2=544533
==============================================================================
--- 
incubator/yoko/trunk/tools/src/test/resources/idlgen/expected_typeInheritance.idl
 (original)
+++ 
incubator/yoko/trunk/tools/src/test/resources/idlgen/expected_typeInheritance.idl
 Tue Jun  5 09:03:09 2007
@@ -22,7 +22,7 @@
 };
 struct Type5 {
     float varFloat;
-    sequence<Type5SequenceStruct>  Type5SequenceStruct_f;
+    Type5SequenceStruct Type5SequenceStruct_f;
 };
 struct Type4AllStruct {
     string varStringExt;

Modified: 
incubator/yoko/trunk/tools/src/test/resources/wsdl/TypeInheritance.wsdl
URL: 
http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/wsdl/TypeInheritance.wsdl?view=diff&rev=544533&r1=544532&r2=544533
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/wsdl/TypeInheritance.wsdl 
(original)
+++ incubator/yoko/trunk/tools/src/test/resources/wsdl/TypeInheritance.wsdl Tue 
Jun  5 09:03:09 2007
@@ -123,7 +123,7 @@
                         </all>
                     </extension>
                 </complexContent>
-            </complexType>
+            </complexType> 
 
             <complexType name="Type5">
                 <sequence>

Added: incubator/yoko/trunk/tools/src/test/resources/wsdl/databaseService.wsdl
URL: 
http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/wsdl/databaseService.wsdl?view=auto&rev=544533
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/wsdl/databaseService.wsdl 
(added)
+++ incubator/yoko/trunk/tools/src/test/resources/wsdl/databaseService.wsdl Tue 
Jun  5 09:03:09 2007
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<wsdl:definitions name="DatabaseService" 
+       targetNamespace="http://schemas.apache.org/dbservice"; 
+       xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"; 
+       xmlns:ns1="http://schemas.apache.org/dbservice"; 
+       xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
+       xmlns:ns2="http://schemas.xmlsoap.org/wsdl/http"; 
+       xmlns:soap="http://schemas.xmlsoap.org/soap/"; 
+       xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";>
+  <wsdl:types>
+<xsd:schema xmlns="http://schemas.apache.org/dbservice"; 
targetNamespace="http://schemas.apache.org/dbservice";>
+<xsd:element name="getName">
+<xsd:complexType>
+<xsd:sequence>
+<xsd:element name="Parameter1" nillable="false" type="xsd:int"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:element>
+<xsd:element name="getNameResponse">
+<xsd:complexType>
+<xsd:sequence>
+<xsd:element maxOccurs="unbounded" minOccurs="0" name="ResultList1" 
type="getNameResponseResultList1Type"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:element>
+<xsd:complexType name="getNameResponseResultList1Type">
+<xsd:sequence>
+<xsd:element name="NAME" nillable="false" type="xsd:string"/>
+</xsd:sequence>
+</xsd:complexType>
+<xsd:element name="getNameFault">
+<xsd:complexType>
+<xsd:sequence>
+<xsd:element name="message" type="xsd:string"/>
+<xsd:element name="category" type="xsd:string"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:element>
+</xsd:schema>
+  </wsdl:types>
+  <wsdl:message name="getNameResponse">
+    <wsdl:part name="getNameResponse" element="ns1:getNameResponse">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getName">
+    <wsdl:part name="getName" element="ns1:getName">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getNameFault">
+    <wsdl:part name="getNameFault" element="ns1:getNameFault">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:portType name="Database">
+    <wsdl:operation name="getName">
+      <wsdl:input name="getName" message="ns1:getName">
+    </wsdl:input>
+      <wsdl:output name="getNameResponse" message="ns1:getNameResponse">
+    </wsdl:output>
+      <wsdl:fault name="getNameFault" message="ns1:getNameFault">
+    </wsdl:fault>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="DBServiceSoapBinding" type="ns1:Database">
+    <wsdlsoap:binding style="document" 
transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="getName">
+      <wsdlsoap:operation style="document"/>
+      <wsdl:input name="getName">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="getNameResponse">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:output>
+      <wsdl:fault name="getNameFault">
+        <wsdlsoap:fault name="soapFault" use="literal"/>
+      </wsdl:fault>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="DatabaseService">
+    <wsdl:port name="DatabaseSoapPort" binding="ns1:DBServiceSoapBinding">
+      <wsdlsoap:address location="http://localhost:9000/dbservice"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>

Propchange: 
incubator/yoko/trunk/tools/src/test/resources/wsdl/databaseService.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
incubator/yoko/trunk/tools/src/test/resources/wsdl/databaseService.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: 
incubator/yoko/trunk/tools/src/test/resources/wsdl/databaseService.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml


Reply via email to