- From: Arthur Ryman via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 26 Mar 2005 19:53:35 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/documents/good/ServiceReference-1G In directory hutz:/tmp/cvs-serv2713/documents/good/ServiceReference-1G Modified Files: reservationList.xsd reservationList.wsdl reservationList-all.xml reservationDetails.wsdl Log Message: Completed service reference example for primer. There is still a minor problem in the definition of the restriction of ServiceType. The <endpoint> element isn't getting the WSDL namespace in the restriction. Index: reservationList.xsd =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/documents/good/ServiceReference-1G/reservationList.xsd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** reservationList.xsd 26 Mar 2005 01:34:30 -0000 1.2 --- reservationList.xsd 26 Mar 2005 19:53:32 -0000 1.3 *************** *** 1,7 **** <?xml version="1.0" encoding="UTF-8"?> ! <schema xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://greath.example.com/2004/schemas/reservationList" xmlns:tns="http://greath.example.com/2004/schemas/reservationList" xmlns:details="http://greath.example.com/2004/schemas/reservationDetails" xmlns:wsdl="http://www.w3.org/2004/08/wsdl" xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance" --- 1,9 ---- <?xml version="1.0" encoding="UTF-8"?> ! <schema xmlns="http://www.w3.org/2001/XMLSchema" ! elementFormDefault="qualified" targetNamespace="http://greath.example.com/2004/schemas/reservationList" xmlns:tns="http://greath.example.com/2004/schemas/reservationList" xmlns:details="http://greath.example.com/2004/schemas/reservationDetails" + xmlns:wdetails="http://greath.example.com/2004/services/reservationDetails" xmlns:wsdl="http://www.w3.org/2004/08/wsdl" xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance" *************** *** 20,64 **** schemaLocation="reservationDetails.xsd" /> ! <element name="reservationList"> <annotation> <documentation> ! A reservation list contains a sequence of zero or more ! reservations. </documentation> </annotation> <complexType> <sequence> ! <element ref="tns:reservation" minOccurs="0" ! maxOccurs="unbounded"> ! </element> </sequence> - <attribute ref="wsdli:wsdlLocation"/> </complexType> </element> ! <element name="reservation"> <annotation> <documentation> ! A reservation contains the confirmation number, check-in ! and check-out dates, and a reference to a reservation ! details Web service. </documentation> </annotation> <complexType> <sequence> ! <element ref="details:confirmationNumber"/> ! <element ref="details:checkInDate"/> ! <element ref="details:checkOutDate"/> ! <element name="reservationDetailsService" ! type="wsdl:ServiceType"> ! <annotation> ! <documentation> ! This element contains a reference to the ! Reservation Details Web Service for this ! reservation. ! </documentation> ! </annotation> </element> </sequence> </complexType> </element> --- 22,90 ---- schemaLocation="reservationDetails.xsd" /> ! <complexType name="ReservationDetailsEndpointType"> ! <complexContent> ! <restriction base="wsdl:EndpointType"> ! <attribute name="binding" type="QName" use="required" ! fixed="wdetails:reservationDetailsSOAPBinding" /> ! <attribute name="address" type="anyURI" use="required" /> ! </restriction> ! </complexContent> ! </complexType> ! ! <complexType name="ReservationDetailsServiceType"> ! <complexContent> ! <restriction base="wsdl:ServiceType"> ! <sequence> ! <element name="endpoint" ! type="tns:ReservationDetailsEndpointType" /> ! </sequence> ! <attribute name="interface" type="QName" use="required" ! fixed="wdetails:reservationDetailsInterface" /> ! </restriction> ! </complexContent> ! </complexType> ! ! <element name="reservationDetailsService" ! type="tns:ReservationDetailsServiceType"> <annotation> <documentation> ! This element contains a reference to the Reservation ! Details Web Service for this reservation. ! </documentation> ! </annotation> ! </element> ! ! <element name="reservation"> ! <annotation> ! <documentation> ! A reservation contains the confirmation number, check-in ! and check-out dates, and a reference to a Reservation ! Details Web service. </documentation> </annotation> <complexType> <sequence> ! <element ref="details:confirmationNumber" /> ! <element ref="details:checkInDate" /> ! <element ref="details:checkOutDate" /> ! <element ref="tns:reservationDetailsService" /> </sequence> </complexType> </element> ! <element name="reservationList"> <annotation> <documentation> ! A reservation list contains a sequence of zero or more ! reservations. </documentation> </annotation> <complexType> <sequence> ! <element ref="tns:reservation" minOccurs="0" ! maxOccurs="unbounded"> </element> </sequence> + <attribute ref="wsdli:wsdlLocation" /> </complexType> </element> Index: reservationList-all.xml =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/documents/good/ServiceReference-1G/reservationList-all.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** reservationList-all.xml 26 Mar 2005 01:34:30 -0000 1.1 --- reservationList-all.xml 26 Mar 2005 19:53:32 -0000 1.2 *************** *** 3,10 **** xmlns="http://greath.example.com/2004/schemas/reservationList" xmlns:details="http://greath.example.com/2004/schemas/reservationDetails" ! xmlns:wdetails="http://greath.example.com/2004/wsdl/reservationDetails" xmlns:wsdl="http://www.w3.org/2004/08/wsdl" xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance" ! wsdli:wsdlLocation="http://greath.example.com/2004/wsdl/reservationDetails reservationDetails.wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://greath.example.com/2004/schemas/reservationList reservationList.xsd http://greath.example.com/2004/schema/reservationDetails reservationDetails.xsd http://www.w3.org/2004/08/wsdl ../../../xmlcatalog/wsdl/wsdl20.xsd http://greath.example.com/2004/schemas/reservationDetails reservationDetails.xsd "> --- 3,10 ---- xmlns="http://greath.example.com/2004/schemas/reservationList" xmlns:details="http://greath.example.com/2004/schemas/reservationDetails" ! xmlns:wdetails="http://greath.example.com/2004/services/reservationDetails" xmlns:wsdl="http://www.w3.org/2004/08/wsdl" xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance" ! wsdli:wsdlLocation="http://greath.example.com/2004/services/reservationDetails reservationDetails.wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://greath.example.com/2004/schemas/reservationList reservationList.xsd http://greath.example.com/2004/schema/reservationDetails reservationDetails.xsd http://www.w3.org/2004/08/wsdl ../../../xmlcatalog/wsdl/wsdl20.xsd http://greath.example.com/2004/schemas/reservationDetails reservationDetails.xsd "> *************** *** 16,23 **** <reservationDetailsService interface="wdetails:reservationDetailsInterface"> ! <wsdl:endpoint name="SOAP-HSG635" binding="wdetails:reservationDetailsSOAPBinding" ! address="http://greath.example.com/2004/reservation/HSG635"> ! </wsdl:endpoint> </reservationDetailsService> </reservation> --- 16,22 ---- <reservationDetailsService interface="wdetails:reservationDetailsInterface"> ! <endpoint name="SOAP-HSG635" binding="wdetails:reservationDetailsSOAPBinding" ! address="http://greath.example.com/2004/reservation/HSG635"/> </reservationDetailsService> </reservation> *************** *** 29,36 **** <reservationDetailsService interface="wdetails:reservationDetailsInterface"> ! <wsdl:endpoint name="SOAP-OMX736" binding="wdetails:reservationDetailsSOAPBinding" ! address="http://greath.example.com/2004/reservation/OMX736"> ! </wsdl:endpoint> </reservationDetailsService> </reservation> --- 28,34 ---- <reservationDetailsService interface="wdetails:reservationDetailsInterface"> ! <endpoint name="SOAP-OMX736" binding="wdetails:reservationDetailsSOAPBinding" ! address="http://greath.example.com/2004/reservation/OMX736"/> </reservationDetailsService> </reservation> *************** *** 42,49 **** <reservationDetailsService interface="wdetails:reservationDetailsInterface"> ! <wsdl:endpoint name="SOAP-WUH663" binding="wdetails:reservationDetailsSOAPBinding" ! address="http://greath.example.com/2004/reservation/WUH663"> ! </wsdl:endpoint> </reservationDetailsService> </reservation> --- 40,46 ---- <reservationDetailsService interface="wdetails:reservationDetailsInterface"> ! <endpoint name="SOAP-WUH663" binding="wdetails:reservationDetailsSOAPBinding" ! address="http://greath.example.com/2004/reservation/WUH663"/> </reservationDetailsService> </reservation> Index: reservationList.wsdl =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/documents/good/ServiceReference-1G/reservationList.wsdl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** reservationList.wsdl 26 Mar 2005 01:34:30 -0000 1.2 --- reservationList.wsdl 26 Mar 2005 19:53:32 -0000 1.3 *************** *** 1,6 **** <?xml version="1.0" encoding="utf-8" ?> <description xmlns="http://www.w3.org/2004/08/wsdl" ! targetNamespace="http://greath.example.com/2004/wsdl/reservationList" ! xmlns:tns="http://greath.example.com/2004/wsdl/reservationList" xmlns:details="http://greath.example.com/2004/schemas/reservationDetails" xmlns:list="http://greath.example.com/2004/schemas/reservationList" --- 1,6 ---- <?xml version="1.0" encoding="utf-8" ?> <description xmlns="http://www.w3.org/2004/08/wsdl" ! targetNamespace="http://greath.example.com/2004/services/reservationList" ! xmlns:tns="http://greath.example.com/2004/services/reservationList" xmlns:details="http://greath.example.com/2004/schemas/reservationDetails" xmlns:list="http://greath.example.com/2004/schemas/reservationList" *************** *** 31,43 **** pattern="http://www.w3.org/2004/03/wsdl/in-out"> <input messageLabel="In" element="#none" /> ! <output messageLabel="Out" ! element="list:reservationList" /> </operation> <operation name="retrieveByConfirmationNumber" pattern="http://www.w3.org/2004/03/wsdl/in-out"> ! <input messageLabel="In" element="details:confirmationNumber" /> ! <output messageLabel="Out" ! element="list:reservationList" /> </operation> --- 31,42 ---- pattern="http://www.w3.org/2004/03/wsdl/in-out"> <input messageLabel="In" element="#none" /> ! <output messageLabel="Out" element="list:reservationList" /> </operation> <operation name="retrieveByConfirmationNumber" pattern="http://www.w3.org/2004/03/wsdl/in-out"> ! <input messageLabel="In" ! element="details:confirmationNumber" /> ! <output messageLabel="Out" element="list:reservationList" /> </operation> *************** *** 45,50 **** pattern="http://www.w3.org/2004/03/wsdl/in-out"> <input messageLabel="In" element="details:checkInDate" /> ! <output messageLabel="Out" ! element="list:reservationList" /> </operation> --- 44,48 ---- pattern="http://www.w3.org/2004/03/wsdl/in-out"> <input messageLabel="In" element="details:checkInDate" /> ! <output messageLabel="Out" element="list:reservationList" /> </operation> *************** *** 52,57 **** pattern="http://www.w3.org/2004/03/wsdl/in-out"> <input messageLabel="In" element="details:checkOutDate" /> ! <output messageLabel="Out" ! element="list:reservationList" /> </operation> --- 50,54 ---- pattern="http://www.w3.org/2004/03/wsdl/in-out"> <input messageLabel="In" element="details:checkOutDate" /> ! <output messageLabel="Out" element="list:reservationList" /> </operation> *************** *** 74,85 **** </binding> ! <service name="reservationListService" ! interface="tns:reservationListInterface"> ! <endpoint name="reservationListEndpoint" ! binding="tns:reservationListSOAPBinding" ! address ="http://greath.example.com/2004/reservationList"/> ! ! </service> --- 71,82 ---- </binding> ! <service name="reservationListService" ! interface="tns:reservationListInterface"> ! <endpoint name="reservationListEndpoint" ! binding="tns:reservationListSOAPBinding" ! address="http://greath.example.com/2004/reservationList" /> ! ! </service> Index: reservationDetails.wsdl =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/documents/good/ServiceReference-1G/reservationDetails.wsdl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** reservationDetails.wsdl 26 Mar 2005 01:34:30 -0000 1.2 --- reservationDetails.wsdl 26 Mar 2005 19:53:32 -0000 1.3 *************** *** 1,6 **** <?xml version="1.0" encoding="utf-8" ?> <description xmlns="http://www.w3.org/2004/08/wsdl" ! targetNamespace="http://greath.example.com/2004/wsdl/reservationDetails" ! xmlns:tns="http://greath.example.com/2004/wsdl/reservationDetails" xmlns:wdetails="http://greath.example.com/2004/schemas/reservationDetails" xmlns:wsoap="http://www.w3.org/2004/08/wsdl/soap12" --- 1,6 ---- <?xml version="1.0" encoding="utf-8" ?> <description xmlns="http://www.w3.org/2004/08/wsdl" ! targetNamespace="http://greath.example.com/2004/services/reservationDetails" ! xmlns:tns="http://greath.example.com/2004/services/reservationDetails" xmlns:wdetails="http://greath.example.com/2004/schemas/reservationDetails" xmlns:wsoap="http://www.w3.org/2004/08/wsdl/soap12" *************** *** 36,40 **** <operation name="update" pattern="http://www.w3.org/2004/03/wsdl/in-out"> ! <input messageLabel="In" element="wdetails:reservationDetails" /> <output messageLabel="Out" element="wdetails:reservationDetails" /> --- 36,41 ---- <operation name="update" pattern="http://www.w3.org/2004/03/wsdl/in-out"> ! <input messageLabel="In" ! element="wdetails:reservationDetails" /> <output messageLabel="Out" element="wdetails:reservationDetails" />
Received on Saturday, 26 March 2005 19:53:35 UTC