- From: Arthur Ryman via cvs-syncmail <cvsmail@w3.org>
- Date: Sun, 19 Feb 2006 23:27:44 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/documents/good/Import-2G In directory hutz:/tmp/cvs-serv2189/test-suite/documents/good/Import-2G Modified Files: XSDImport2.wsdl XSDImport.wsdl name.xsd Log Message: Updated Test Suite to use Ant 1.7 alpha <schemavalidate> task which allows us to remove schemaLocation information from the documents. Index: XSDImport.wsdl =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/documents/good/Import-2G/XSDImport.wsdl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** XSDImport.wsdl 25 Jan 2006 18:32:45 -0000 1.4 --- XSDImport.wsdl 19 Feb 2006 23:27:42 -0000 1.5 *************** *** 1,25 **** <?xml version="1.0" encoding="UTF-8"?> ! <wsdl:description ! targetNamespace="http://example.org/XSDImport" ! xmlns:name="http://example.org/name" ! xmlns:wsdl="http://www.w3.org/2006/01/wsdl" ! xmlns:xs="http://www.w3.org/2001/XMLSchema" ! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ! xsi:schemaLocation="http://www.w3.org/2006/01/wsdl ../../../xmlcatalog/wsdl/wsdl20.xsd http://www.w3.org/2001/XMLSchema ../../../xmlcatalog/xsd/XMLSchema.xsd"> ! ! <wsdl:documentation> ! This test shows a valid use of an XML schema import. ! </wsdl:documentation> ! <wsdl:types> ! <xs:import schemaLocation="name.xsd" ! namespace="http://example.org/name" /> ! </wsdl:types> ! ! <wsdl:interface name="Names"> ! <wsdl:operation name="getNameFromSIN" pattern="http://www.w3.org/2006/01/wsdl/in-out"> ! <wsdl:input element="name:SIN"/> ! <wsdl:output element="name:Name"/> ! </wsdl:operation> ! </wsdl:interface> </wsdl:description> --- 1,23 ---- <?xml version="1.0" encoding="UTF-8"?> ! <wsdl:description targetNamespace="http://example.org/XSDImport" ! xmlns:name="http://example.org/name" ! xmlns:wsdl="http://www.w3.org/2006/01/wsdl" ! xmlns:xs="http://www.w3.org/2001/XMLSchema"> ! <wsdl:documentation> ! This test shows a valid use of an XML schema import. ! </wsdl:documentation> ! ! <wsdl:types> ! <xs:import schemaLocation="name.xsd" ! namespace="http://example.org/name" /> ! </wsdl:types> ! ! <wsdl:interface name="Names"> ! <wsdl:operation name="getNameFromSIN" ! pattern="http://www.w3.org/2006/01/wsdl/in-out"> ! <wsdl:input element="name:SIN" /> ! <wsdl:output element="name:Name" /> ! </wsdl:operation> ! </wsdl:interface> </wsdl:description> Index: name.xsd =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/documents/good/Import-2G/name.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** name.xsd 7 Feb 2005 16:31:57 -0000 1.1 --- name.xsd 19 Feb 2006 23:27:42 -0000 1.2 *************** *** 1,16 **** <?xml version="1.0" encoding="UTF-8"?> ! <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://example.org/name" xmlns:tns="http://example.org/name" ! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ! xsi:schemaLocation="http://www.w3.org/2001/XMLSchema ../../../xmlcatalog/xsd/XMLSchema.xsd"> ! <!-- This document is used as a sample XML schema document. --> ! <element name="Name"> ! <complexType> ! <sequence> ! <element name="FirstName" type="string"></element> ! <element name="LastName" type="string"></element> ! </sequence> ! </complexType> ! </element> ! <element name="SIN" type="string"/> </schema> \ No newline at end of file --- 1,16 ---- <?xml version="1.0" encoding="UTF-8"?> ! <schema xmlns="http://www.w3.org/2001/XMLSchema" ! targetNamespace="http://example.org/name" ! xmlns:tns="http://example.org/name"> ! <!-- This document is used as a sample XML schema document. --> ! <element name="Name"> ! <complexType> ! <sequence> ! <element name="FirstName" type="string"></element> ! <element name="LastName" type="string"></element> ! </sequence> ! </complexType> ! </element> ! <element name="SIN" type="string" /> </schema> \ No newline at end of file Index: XSDImport2.wsdl =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/documents/good/Import-2G/XSDImport2.wsdl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** XSDImport2.wsdl 25 Jan 2006 18:32:45 -0000 1.4 --- XSDImport2.wsdl 19 Feb 2006 23:27:42 -0000 1.5 *************** *** 1,28 **** <?xml version="1.0" encoding="UTF-8"?> ! <wsdl:description ! targetNamespace="http://example.org/XSDImport" ! xmlns:name="http://example.org/name" ! xmlns:wsdl="http://www.w3.org/2006/01/wsdl" ! xmlns:xs="http://www.w3.org/2001/XMLSchema" ! xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ! xsi:schemaLocation="http://www.w3.org/2006/01/wsdl ../../../xmlcatalog/wsdl/wsdl20.xsd http://www.w3.org/2001/XMLSchema ../../../xmlcatalog/xsd/XMLSchema.xsd"> ! ! <wsdl:documentation> ! This test shows that the XML schema import is valid when it is imported in ! both this document and the document this imports. ! </wsdl:documentation> ! <wsdl:include location="XSDImport.wsdl"/> ! ! <wsdl:types> ! <xs:import schemaLocation="name.xsd" ! namespace="http://example.org/name" /> ! </wsdl:types> ! ! <wsdl:interface name="Names"> ! <wsdl:operation name="getNameFromSIN" pattern="http://www.w3.org/2006/01/wsdl/in-out"> ! <wsdl:input element="name:SIN"/> ! <wsdl:output element="name:Name"/> ! </wsdl:operation> ! </wsdl:interface> </wsdl:description> --- 1,26 ---- <?xml version="1.0" encoding="UTF-8"?> ! <wsdl:description targetNamespace="http://example.org/XSDImport" ! xmlns:name="http://example.org/name" ! xmlns:wsdl="http://www.w3.org/2006/01/wsdl" ! xmlns:xs="http://www.w3.org/2001/XMLSchema"> ! <wsdl:documentation> ! This test shows that the XML schema import is valid when it is ! imported in both this document and the document this imports. ! </wsdl:documentation> ! ! <wsdl:include location="XSDImport.wsdl" /> ! ! <wsdl:types> ! <xs:import schemaLocation="name.xsd" ! namespace="http://example.org/name" /> ! </wsdl:types> ! ! <wsdl:interface name="Names"> ! <wsdl:operation name="getNameFromSIN" ! pattern="http://www.w3.org/2006/01/wsdl/in-out"> ! <wsdl:input element="name:SIN" /> ! <wsdl:output element="name:Name" /> ! </wsdl:operation> ! </wsdl:interface> </wsdl:description>
Received on Sunday, 19 February 2006 23:28:19 UTC