- From: Arthur Ryman via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 27 Sep 2005 21:13:18 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/wsdl20
In directory hutz:/tmp/cvs-serv31846/wsdl20
Modified Files:
component-assertion-table.xml xmlspec.dtd
document-assertion-table.xml
Log Message:
Reverted some changes to xmlspec.dtd in light of better assertion.xsl.
Index: xmlspec.dtd
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/xmlspec.dtd,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** xmlspec.dtd 27 Sep 2005 20:05:38 -0000 1.17
--- xmlspec.dtd 27 Sep 2005 21:13:16 -0000 1.18
***************
*** 325,329 ****
#2000-03-07: maler: Updated XLink usage to February 2000 draft,
# except that href still has no namespace prefix.
- #2005-09025: ryman: Added xmlns.att.
-->
--- 325,328 ----
***************
*** 334,338 ****
element. -->
<!ENTITY % simple-xlink.att
! 'xlink:type CDATA #FIXED "simple" '>
<!-- href attributes:
--- 333,339 ----
element. -->
<!ENTITY % simple-xlink.att
! 'xmlns:xlink CDATA #FIXED
! "http://www.w3.org/1999/xlink"
! xlink:type CDATA #FIXED "simple" '>
<!-- href attributes:
***************
*** 392,401 ****
'role NMTOKEN #IMPLIED'>
- <!-- XML Namespace attributes:
- These namespace prefixes can occur anywhere after an XSLT copy -->
- <!ENTITY % xmlns.att
- 'xmlns:xlink CDATA #IMPLIED
- xmlns:z CDATA #IMPLIED'>
-
<!-- Common attributes:
Every element has an ID attribute for links, a role
--- 393,396 ----
***************
*** 407,417 ****
'id ID #IMPLIED
%role.att;
! %diff.att;
! %xmlns.att;'>
<!ENTITY % common-idreq.att
'id ID #REQUIRED
%role.att;
! %diff.att;
! %xmlns.att;'>
<!-- ............................................................... -->
--- 402,410 ----
'id ID #IMPLIED
%role.att;
! %diff.att;'>
<!ENTITY % common-idreq.att
'id ID #REQUIRED
%role.att;
! %diff.att;'>
<!-- ............................................................... -->
***************
*** 473,476 ****
--- 466,473 ----
|ext-review
|final) #IMPLIED
+ xmlns:xlink CDATA #FIXED
+ "http://www.w3.org/1999/xlink"
+ xmlns:z CDATA #FIXED
+ "http://www.w3.org/2004/zml"
>
]]>
***************
*** 2702,2723 ****
<!ELEMENT compdef (#PCDATA)>
- <!ATTLIST compdef
- %xmlns.att;>
<!ELEMENT comp (#PCDATA)>
! <!ATTLIST comp
! %xmlns.att;
! href CDATA #IMPLIED>
<!ELEMENT propdef (#PCDATA)>
! <!ATTLIST propdef
! %xmlns.att;
! comp CDATA #IMPLIED>
<!ELEMENT prop (#PCDATA)>
! <!ATTLIST prop
! %xmlns.att;
! comp CDATA #IMPLIED
! href CDATA #IMPLIED>
<!ELEMENT z:math ANY>
--- 2699,2712 ----
<!ELEMENT compdef (#PCDATA)>
<!ELEMENT comp (#PCDATA)>
! <!ATTLIST comp href CDATA #IMPLIED>
<!ELEMENT propdef (#PCDATA)>
! <!ATTLIST propdef comp CDATA #IMPLIED>
<!ELEMENT prop (#PCDATA)>
! <!ATTLIST prop comp CDATA #IMPLIED>
! <!ATTLIST prop href CDATA #IMPLIED>
<!ELEMENT z:math ANY>
Index: component-assertion-table.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/component-assertion-table.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** component-assertion-table.xml 26 Sep 2005 16:47:14 -0000 1.1
--- component-assertion-table.xml 27 Sep 2005 21:13:16 -0000 1.2
***************
*** 12,16 ****
Furthermore, all QName references, whether to the same or
to different namespaces MUST resolve to components (see
! <specref xmlns:z="http://www.w3.org/2004/zml" ref="qnameres"/>
).
</td>
--- 12,16 ----
Furthermore, all QName references, whether to the same or
to different namespaces MUST resolve to components (see
! <specref ref="qnameres"/>
).
</td>
Index: document-assertion-table.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/document-assertion-table.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** document-assertion-table.xml 26 Sep 2005 16:47:18 -0000 1.1
--- document-assertion-table.xml 27 Sep 2005 21:13:16 -0000 1.2
***************
*** 12,16 ****
Imported components have different target namespace
values from the
! <comp xmlns:z="http://www.w3.org/2004/zml">Description</comp>
component that is importing them.
</td>
--- 12,16 ----
Imported components have different target namespace
values from the
! <comp>Description</comp>
component that is importing them.
</td>
***************
*** 24,31 ****
definitions that refer by QName to WSDL 2.0 components
that belong to a different namespace MUST contain a
! <el xmlns:z="http://www.w3.org/2004/zml">wsdl:import</el>
! <emph xmlns:z="http://www.w3.org/2004/zml">element information item</emph>
for that namespace (see
! <specref xmlns:z="http://www.w3.org/2004/zml" ref="imports"/>
).
</td>
--- 24,31 ----
definitions that refer by QName to WSDL 2.0 components
that belong to a different namespace MUST contain a
! <el>wsdl:import</el>
! <emph>element information item</emph>
for that namespace (see
! <specref ref="imports"/>
).
</td>
Received on Tuesday, 27 September 2005 21:13:22 UTC