- From: Arthur Ryman <aryman@dev.w3.org>
- Date: Thu, 03 Feb 2005 14:40:08 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl
In directory hutz:/tmp/cvs-serv24848/xmlcatalog/wsdl
Modified Files:
wsdl20-soap.xsd wsdl20.xsd entities.dtd entitieswd.dtd
entitiesedcopy.dtd
Added Files:
wsdl20-rpc.xsd
Log Message:
Updated WSDL schemas.
Index: entitieswd.dtd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl/entitieswd.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** entitieswd.dtd 3 Feb 2005 14:36:51 -0000 1.1
--- entitieswd.dtd 3 Feb 2005 14:40:06 -0000 1.2
***************
*** 4,14 ****
Date parameters
-->
! <!ENTITY draft.year "2003">
! <!ENTITY draft.month "November">
! <!ENTITY draft.mm "07">
! <!ENTITY draft.day "10">
! <!ENTITY draft.dd "10">
<!-- Don't touch after this line -->
<!ENTITY draft.date "&draft.year;&draft.mm;&draft.dd;">
--- 4,19 ----
Date parameters
-->
! <!ENTITY draft.year "2004">
! <!ENTITY draft.month "December">
! <!ENTITY draft.mm "12">
! <!ENTITY draft.day "21">
! <!ENTITY draft.dd "21">
<!-- Don't touch after this line -->
+ <!-- ****** WARNING ********
+ WARNING from dbooth: I had to change some lines below, because the
+ primer pub date is different from the other parts.
+ Look for "dbooth" below.
+ ************** -->
<!ENTITY draft.date "&draft.year;&draft.mm;&draft.dd;">
***************
*** 16,21 ****
<!ENTITY part0.prefix "wsdl20-primer">
<!ENTITY part1.prefix "wsdl20">
! <!ENTITY part2.prefix "wsdl20-patterns">
<!ENTITY part3.prefix "wsdl20-bindings">
<!ENTITY reqs.prefix "ws-desc-reqs">
--- 21,27 ----
<!ENTITY part0.prefix "wsdl20-primer">
<!ENTITY part1.prefix "wsdl20">
! <!ENTITY part2.prefix "wsdl20-extensions">
<!ENTITY part3.prefix "wsdl20-bindings">
+ <!ENTITY soap11binding.prefix "wsdl20-soap11-binding">
<!ENTITY reqs.prefix "ws-desc-reqs">
***************
*** 35,38 ****
--- 41,46 ----
<!ENTITY w3c-designation-part0
"&w3c.tr.latest;/&draft.year;/WD-&part0.prefix;-&draft.date;">
+
+ <!-- dbooth: Here are the old lines for all the same dates:
<!ENTITY w3c-designation-part1
"&w3c.tr.latest;/&draft.year;/WD-&part1.prefix;-&draft.date;">
***************
*** 41,44 ****
--- 49,64 ----
<!ENTITY w3c-designation-part3
"&w3c.tr.latest;/&draft.year;/WD-&part3.prefix;-&draft.date;">
+ -->
+
+ <!-- dbooth: Here are the new lines for different dates: -->
+ <!ENTITY w3c-designation-part1
+ "&w3c.tr.latest;/&draft.year;/WD-&part1.prefix;-20040803">
+ <!ENTITY w3c-designation-part2
+ "&w3c.tr.latest;/&draft.year;/WD-&part2.prefix;-20040803">
+ <!ENTITY w3c-designation-part3
+ "&w3c.tr.latest;/&draft.year;/WD-&part3.prefix;-20040803">
+
+ <!ENTITY w3c-designation-soap11binding
+ "&w3c.tr.latest;/&draft.year;/WD-&soap11binding.prefix;-&draft.date;">
<!ENTITY w3c-designation-reqs
"&w3c.tr.latest;/&draft.year;/WD-&reqs.prefix;-&draft.date;">
***************
*** 49,55 ****
<!ENTITY altlocs
"<altlocs>
! <loc role='postscript' href='&w3c-designation-generic;/&prefix;.ps'>postscript</loc>
! <loc role='pdf' href='&w3c-designation-generic;/&prefix;.pdf'>PDF</loc>
! <loc role='xml' href='&w3c-designation-generic;/&prefix;.xml'>XML</loc>
! <loc role='plain' href='&w3c-designation-generic;/&prefix;.txt'>plain text</loc>
</altlocs>">
--- 69,77 ----
<!ENTITY altlocs
"<altlocs>
! <loc role='dhtml' href='&prefix;-i.html'>DHTML</loc>
! <loc role='ie' href='&prefix;-ie.html'>IE</loc>
! <loc role='postscript' href='&prefix;.ps'>postscript</loc>
! <loc role='pdf' href='&prefix;.pdf'>PDF</loc>
! <loc role='xml' href='&prefix;.xml'>XML</loc>
! <loc role='plain' href='&prefix;.txt'>plain text</loc>
</altlocs>">
--- NEW FILE: wsdl20-rpc.xsd ---
<?xml version='1.0' encoding='UTF-8'?>
<!-- $Id: wsdl20-rpc.xsd,v 1.1 2005/02/03 14:40:06 aryman Exp $ -->
<!--
W3C XML Schema defined in the Web Services Description (WSDL)
Version 2.0 specification
http://www.w3.org/TR/wsdl20
Copyright (c) 2004 World Wide Web Consortium,
(Massachusetts Institute of Technology, European Research Consortium for
Informatics and Mathematics, Keio University). All Rights Reserved. This
work is distributed under the W3C(r) Software License [1] in the hope that
it will be useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-->
<!DOCTYPE xs:schema PUBLIC '-//W3C//DTD XMLSCHEMA 200102//EN'
'http://www.w3.org/2001/XMLSchema.dtd' [
<!ENTITY % entities SYSTEM 'entities.dtd' >
%entities;
]>
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
targetNamespace='&wsdl-rpc-ns;'
xmlns:wrpc="&wsdl-rpc-ns;"
elementFormDefault='qualified' >
<xs:attribute name="signature" type="wrpc:signatureType">
<xs:annotation>
<xs:documentation>
This attribute can be used as an extension to describe the RPC signature
associated with an operation that uses the RPC style.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:simpleType name="signatureType">
<xs:list itemType="wrpc:signatureItemType"/>
</xs:simpleType>
<xs:simpleType name="signatureItemType">
<xs:union memberTypes="wrpc:directionToken xsd:QName"/>
</xs:simpleType>
<xs:simpleType name="directionToken">
<xs:restriction base="xs:token">
<xs:enumeration value="#in"/>
<xs:enumeration value="#out"/>
<xs:enumeration value="#inout"/>
<xs:enumeration value="#return"/>
</xs:restriction>
</xs:simpleType>
</xs:schema>
Index: wsdl20-soap.xsd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl/wsdl20-soap.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wsdl20-soap.xsd 3 Feb 2005 14:36:51 -0000 1.1
--- wsdl20-soap.xsd 3 Feb 2005 14:40:06 -0000 1.2
***************
*** 22,33 ****
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
! targetNamespace="&wsdl-soap12-ns;"
! xmlns:tns="&wsdl-soap12-ns;"
xmlns:wsdl="&wsdl-ns;"
elementFormDefault="qualified"
! attributeFormDefault="unqualified">
<xs:import namespace="&wsdl-ns;" location="&wsdl-ns;"/>
!
<xs:attribute name="protocol" type="xs:anyURI" />
--- 22,34 ----
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
! targetNamespace="&wsdl-soap-ns;"
! xmlns:tns="&wsdl-soap-ns;"
xmlns:wsdl="&wsdl-ns;"
elementFormDefault="qualified"
! attributeFormDefault="unqualified" >
<xs:import namespace="&wsdl-ns;" location="&wsdl-ns;"/>
!
! <xs:attribute name="version" type="xs:string"/>
<xs:attribute name="protocol" type="xs:anyURI" />
Index: entities.dtd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl/entities.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** entities.dtd 3 Feb 2005 14:36:51 -0000 1.1
--- entities.dtd 3 Feb 2005 14:40:06 -0000 1.2
***************
*** 1,4 ****
- <?xml version='1.0' encoding='ISO-8859-1' ?>
-
<!--
comment this entity for publication
--- 1,2 ----
***************
*** 9,14 ****
uncomment the following entity for publication, and change the date
in entitieswd.dtd
- -->
- <!--
<!ENTITY % sub.entities SYSTEM "entitieswd.dtd" >
-->
--- 7,10 ----
***************
*** 16,19 ****
--- 12,21 ----
%sub.entities;
+ <!-- Titles -->
+ <!ENTITY part1.title "Web Services Description Language (WSDL) Version 2.0 Part 1: Core Language">
+ <!ENTITY part2.title "Web Services Description Language (WSDL) Version 2.0 Part 2: Predefined Extensions">
+ <!ENTITY part3.title "Web Services Description Language (WSDL) Version 2.0 Part 3: Bindings">
+ <!ENTITY soap11binding.title "Web Services Description Language (WSDL) Version 2.0 SOAP 1.1 Binding">
+
<!-- Latest version links. don't touch -->
<!ENTITY part0.latest "&w3c.tr.latest;/&part0.prefix;">
***************
*** 21,29 ****
<!ENTITY part2.latest "&w3c.tr.latest;/&part2.prefix;">
<!ENTITY part3.latest "&w3c.tr.latest;/&part3.prefix;">
<!ENTITY reqs.latest "&w3c.tr.latest;/&part2.prefix;">
<!ENTITY dated-testcollection "&w3c.tr.latest;/&testcollection.prefix;">
! <!-- WG members -->
<!ENTITY % wgmb SYSTEM "wgmb.txt" >
<!ENTITY % prevwgmb SYSTEM "prevwgmb.txt" >
--- 23,33 ----
<!ENTITY part2.latest "&w3c.tr.latest;/&part2.prefix;">
<!ENTITY part3.latest "&w3c.tr.latest;/&part3.prefix;">
+ <!ENTITY soap11binding.latest "&w3c.tr.latest;/&soap11binding.prefix;">
<!ENTITY reqs.latest "&w3c.tr.latest;/&part2.prefix;">
<!ENTITY dated-testcollection "&w3c.tr.latest;/&testcollection.prefix;">
! <!-- Acknowledgements -->
! <!ENTITY acknowledgements SYSTEM "acknowledgements.xml" >
<!ENTITY % wgmb SYSTEM "wgmb.txt" >
<!ENTITY % prevwgmb SYSTEM "prevwgmb.txt" >
***************
*** 47,50 ****
--- 51,65 ----
<!ENTITY soap12-http-uri
"http://www.w3.org/2003/05/soap/bindings/HTTP/">
+ <!ENTITY soap12-request-response-mep-uri
+ "http://www.w3.org/2003/05/soap/mep/request-response/">
+ <!ENTITY soap12-soap-response-mep-uri
+ "http://www.w3.org/2003/05/soap/mep/soap-response/">
+
+ <!ENTITY soap11-http-uri
+ "http://www.w3.org/&draft.year;/&draft.mm;/soap11/bindings/HTTP">
+ <!ENTITY soap11-request-response-mep-uri
+ "http://www.w3.org/&draft.year;/&draft.mm;/soap11/mep/request-response">
+ <!ENTITY soap11-one-way-mep-uri
+ "http://www.w3.org/&draft.year;/&draft.mm;/soap11/mep/one-way">
<!ENTITY wsdl-ns
***************
*** 52,55 ****
--- 67,72 ----
<!ENTITY wsdl-i-ns
"http://www.w3.org/&draft.year;/&draft.mm;/wsdl-instance">
+ <!ENTITY wsdl-soap-ns
+ "http://www.w3.org/&draft.year;/&draft.mm;/wsdl/soap">
<!ENTITY wsdl-soap11-ns
"http://www.w3.org/&draft.year;/&draft.mm;/wsdl/soap11">
***************
*** 62,65 ****
--- 79,101 ----
<!ENTITY wsdl-rpc-ns
"http://www.w3.org/&draft.year;/&draft.mm;/wsdl/rpc">
+ <!ENTITY wsdl-schema-dtd-ns
+ "http://www.w3.org/&draft.year;/&draft.mm;/wsdl/dtd-import">
+
+ <!ENTITY wsdl-mep-in-only
+ "&wsdl-ns;/in-only">
+ <!ENTITY wsdl-mep-robust-in-only
+ "&wsdl-ns;/robust-in-only">
+ <!ENTITY wsdl-mep-in-out
+ "&wsdl-ns;/in-out">
+ <!ENTITY wsdl-mep-in-opt-out
+ "&wsdl-ns;/in-opt-out">
+ <!ENTITY wsdl-mep-out-only
+ "&wsdl-ns;/out-only">
+ <!ENTITY wsdl-mep-robust-out-only
+ "&wsdl-ns;/robust-out-only">
+ <!ENTITY wsdl-mep-out-in
+ "&wsdl-ns;/out-in">
+ <!ENTITY wsdl-mep-out-opt-in
+ "&wsdl-ns;/out-opt-in">
<!-- Misc entities. Feel free to add more -->
***************
*** 71,74 ****
--- 107,117 ----
<!ENTITY ATTR-SET-STYLE "http://www.w3.org/&draft.year;/&draft.mm;/wsdl/style/set-attribute">
<!ENTITY ATTR-GET-STYLE "http://www.w3.org/&draft.year;/&draft.mm;/wsdl/style/get-attribute">
+ <!ENTITY URI-STYLE "http://www.w3.org/&draft.year;/&draft.mm;/wsdl/style/uri">
+ <!ENTITY MULTIPART-STYLE "http://www.w3.org/&draft.year;/&draft.mm;/wsdl/style/multipart">
+
+ <!ENTITY AD-MODULE "http://www.w3.org/&draft.year;/&draft.mm;/wsdl/module/AD">
+ <!ENTITY AD-FEATURE "http://www.w3.org/&draft.year;/&draft.mm;/wsdl/feature/AD">
+ <!ENTITY AD-FEATURE-HTTP "http://www.w3.org/&draft.year;/&draft.mm;/wsdl/feature/AD-HTTP">
+ <!ENTITY AD-FEATURE-DATA-P "http://www.w3.org/&draft.year;/&draft.mm;/wsdl/feature/AD/data">
<!-- add b,u,i -->
Index: wsdl20.xsd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl/wsdl20.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wsdl20.xsd 3 Feb 2005 14:36:51 -0000 1.1
--- wsdl20.xsd 3 Feb 2005 14:40:06 -0000 1.2
***************
*** 63,67 ****
<!-- definitions element decl and type def -->
! <xs:element name='definitions' type='wsdl:DefinitionsType' >
<xs:unique name='interface' >
<xs:selector xpath='wsdl:interface' />
--- 63,67 ----
<!-- definitions element decl and type def -->
! <xs:element name='description' type='wsdl:DescriptionType' >
<xs:unique name='interface' >
<xs:selector xpath='wsdl:interface' />
***************
*** 78,82 ****
</xs:element>
! <xs:complexType name='DefinitionsType' >
<xs:annotation>
<xs:documentation>
--- 78,82 ----
</xs:element>
! <xs:complexType name='DescriptionType' >
<xs:annotation>
<xs:documentation>
Index: entitiesedcopy.dtd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/xmlcatalog/wsdl/entitiesedcopy.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** entitiesedcopy.dtd 3 Feb 2005 14:36:51 -0000 1.1
--- entitiesedcopy.dtd 3 Feb 2005 14:40:06 -0000 1.2
***************
*** 18,23 ****
<!ENTITY part0.prefix "wsdl20-primer">
<!ENTITY part1.prefix "wsdl20">
! <!ENTITY part2.prefix "wsdl20-patterns">
<!ENTITY part3.prefix "wsdl20-bindings">
<!ENTITY reqs.prefix "ws-desc-reqs">
<!ENTITY testcollection.prefix "wsdl20-testcollection">
--- 18,24 ----
<!ENTITY part0.prefix "wsdl20-primer">
<!ENTITY part1.prefix "wsdl20">
! <!ENTITY part2.prefix "wsdl20-extensions">
<!ENTITY part3.prefix "wsdl20-bindings">
+ <!ENTITY soap11binding.prefix "wsdl20-soap11-binding">
<!ENTITY reqs.prefix "ws-desc-reqs">
<!ENTITY testcollection.prefix "wsdl20-testcollection">
***************
*** 39,42 ****
--- 40,46 ----
<!ENTITY w3c-designation-part3
"&part3.prefix;.html">
+ <!ENTITY w3c-designation-soap11binding
+ "&soap11binding.prefix;.html">
+
<!ENTITY w3c-designation-reqs
"&reqs.prefix;.html">
Received on Thursday, 3 February 2005 14:40:09 UTC