2002/ws/desc/wsdl20 wsdl20-z-ie.html,NONE,1.1 wsdl20-z.html,1.6,1.7 build.xml,1.16,1.17 wsdl20-adjuncts.html,1.4,1.5 wsdl20.tex,1.27,1.28 wsdl20.html,1.162,1.163 wsdl20.pdf,1.20,1.21 zml.css,1.4,1.5 wsdl20.xml,1.191,1.192 wsdl20.toc,1.15,1.16 wsdl20-ie.html,1.24,NONE wsdl20-i.html,1.26,NONE

Update of /sources/public/2002/ws/desc/wsdl20
In directory hutz:/tmp/cvs-serv27946

Modified Files:
	build.xml wsdl20-adjuncts.html wsdl20.tex wsdl20.html 
	wsdl20.pdf zml.css wsdl20.xml wsdl20.toc 
Added Files:
	wsdl20-z-ie.html wsdl20-z.html 
Removed Files:
	wsdl20-ie.html wsdl20-i.html 
Log Message:
Renamed non-normative Z versions to wsdl20-z.html and wsdl20-z-ie.html.

Index: wsdl20-adjuncts.html
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20-adjuncts.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wsdl20-adjuncts.html	17 Mar 2005 17:19:06 -0000	1.4
--- wsdl20-adjuncts.html	20 Mar 2005 19:35:09 -0000	1.5
***************
*** 1,15 ****
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
!     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
! <html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
! <head>
! <meta name="generator" content=
! "HTML Tidy for Linux/x86 (vers 1st August 2004), see www.w3.org" />
! <meta http-equiv="Content-Type" content=
! "text/html; charset=utf-8" />
! <title>Web Services Description Language (WSDL) Version 2.0 Part 2:
! Adjuncts</title>
[...9461 lines suppressed...]
!               <td rowspan="1" colspan="1">JJM</td>
!               <td rowspan="1" colspan="1">Simplified the introduction; referred to Part1 for a longer introduction</td>
!             </tr>
!             <tr>
!               <td rowspan="1" colspan="1">20020221</td>
!               <td rowspan="1" colspan="1">JJM</td>
!               <td rowspan="1" colspan="1">Renamed to "Part 2: Bindings"</td>
!             </tr>
!             <tr>
!               <td rowspan="1" colspan="1">20020221</td>
!               <td rowspan="1" colspan="1">JJM</td>
!               <td rowspan="1" colspan="1">Created from http://www.w3.org/TR/2001/NOTE-wsdl-20010315</td>
!             </tr>
!           </tbody>
!         </table><br>
!       </div>
!     </div>
!   </div>
! </body></html>
\ No newline at end of file

Index: build.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** build.xml	16 Mar 2005 23:13:33 -0000	1.16
--- build.xml	20 Mar 2005 19:35:09 -0000	1.17
***************
*** 27,30 ****
--- 27,34 ----
  	ChangeLog:
  	
+ 	2005-03-20: Arthur Ryman <ryman@ca.ibm.com>
+ 	- rename wsdl20-i.html to wsdl20-z.html
+ 	- rename wsdl20-ie.html to wsdl20-z-ie.html
+ 	
  	2005-03-16: Arthur Ryman <ryman@ca.ibm.com>
  	- replace bindings and extensions by adjuncts
***************
*** 75,79 ****
  <project name="wsdl20" default="main" basedir=".">
  
! 	<target name="main" depends="validate, typecheck, html, html-i, html-ie, pdf, zml-test" description="Creates all output files." />
  
  	<target name="rebuild" depends="clean, main" description="Creates all output files from scratch." />
--- 79,83 ----
  <project name="wsdl20" default="main" basedir=".">
  
! 	<target name="main" depends="validate, typecheck, html, html-z, html-z-ie, pdf, zml-test" description="Creates all output files." />
  
  	<target name="rebuild" depends="clean, main" description="Creates all output files from scratch." />
***************
*** 83,88 ****
  		<delete file="wsdl20.tex" />
  		<delete file="wsdl20.html" />
! 		<delete file="wsdl20-i.html" />
! 		<delete file="wsdl20-ie.html" />
  		<delete file="wsdl20-adjuncts.html" />
  		<delete file="wsdl20-elements.txt" />
--- 87,92 ----
  		<delete file="wsdl20.tex" />
  		<delete file="wsdl20.html" />
! 		<delete file="wsdl20-z.html" />
! 		<delete file="wsdl20-z-ie.html" />
  		<delete file="wsdl20-adjuncts.html" />
  		<delete file="wsdl20-elements.txt" />
***************
*** 124,135 ****
  	</target>
  
! 	<target name="html-i" description="Transforms xml into interactive html.">
! 		<xslt in="wsdl20.xml" out="wsdl20-i.html" style="xmlspec-wsdl.xsl">
  			<param name="interactive" expression="true" />
  		</xslt>
  	</target>
  	
! 	<target name="html-ie" description="Transforms xml into Internet Explorer html.">
! 		<xslt in="wsdl20.xml" out="wsdl20-ie.html" style="xmlspec-wsdl.xsl">
  			<param name="renderAs" expression="fonts" />
  			<param name="interactive" expression="true" />
--- 128,139 ----
  	</target>
  
! 	<target name="html-z" description="Transforms xml into Z html.">
! 		<xslt in="wsdl20.xml" out="wsdl20-z.html" style="xmlspec-wsdl.xsl">
  			<param name="interactive" expression="true" />
  		</xslt>
  	</target>
  	
! 	<target name="html-z-ie" description="Transforms xml into Z Internet Explorer html.">
! 		<xslt in="wsdl20.xml" out="wsdl20-z-ie.html" style="xmlspec-wsdl.xsl">
  			<param name="renderAs" expression="fonts" />
  			<param name="interactive" expression="true" />

--- NEW FILE: wsdl20-z-ie.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="en"><head><META http-equiv="Content-Type" content="text/html; charset=utf-8"><title>Web Services Description Language (WSDL) Version 2.0 Part 1: Core Language</title><style type="text/css">
code           { font-family: monospace; }

div.constraint,
div.issue,
div.note,
div.notice     { margin-left: 2em; }

dt.label       { display: run-in; }

li, p           { margin-top: 0.3em;
                 margin-bottom: 0.3em; }

.diff-chg	{ background-color: yellow; }
.diff-del	{ background-color: red; text-decoration: line-through;}
.diff-add	{ background-color: lime; }

table          { empty-cells: show; }
[...9839 lines suppressed...]
    </tr>
    <tr>
       <td rowspan="1" colspan="1">20020620</td>
       <td rowspan="1" colspan="1">SW</td>
       <td rowspan="1" colspan="1">Started adding abstract model</td>
    </tr>
    <tr>
       <td rowspan="1" colspan="1">20020406</td>
       <td rowspan="1" colspan="1">SW</td>
       <td rowspan="1" colspan="1">Created document from WSDL 1.1</td>
    </tr>
  </tbody>
</table><br>

      </div>
    </div>

  </div>

</body></html>
Index: wsdl20.tex
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20.tex,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** wsdl20.tex	16 Mar 2005 23:13:34 -0000	1.27
--- wsdl20.tex	20 Mar 2005 19:35:09 -0000	1.28
***************
*** 334,339 ****
  
  
! Z Notation \hyperlink{ZNotationReferenceManual}{[\textit{Z Notation Reference Manual}]} was used in the development of this specification
! to formalize the WSDL Component Model.
  Z Notation is a formal specification language that is based on standard mathematical notation. 
  The Z Notation for this specification has been verified using the
--- 334,338 ----
  
  
! Z Notation \hyperlink{ZNotationReferenceManual}{[\textit{Z Notation Reference Manual}]} was used in the development of this specification.
  Z Notation is a formal specification language that is based on standard mathematical notation. 
  The Z Notation for this specification has been verified using the
***************
*** 342,361 ****
  
  
! Since Z Notation is not widely known, it is not part of the normative version of this specification.
! However, it is included in two non-normative versions.
! The non-normative \href{wsdl20-i.html}{DHTML} version of this specification allows the reader to interactively
! hide and show the Z Notation.
! The DHTML version of this specification is compliant with the W3C Character Model \hyperlink{W3CCharacterModel}{[\textit{Character Model}]}
! which uses Unicode characters to encode the mathematical symbols that appear in Z Notation.
! Mozilla Firefox correctly displays Unicode characters, provided that the required fonts are installed.
  Mathematical fonts for Mozilla Firefox can be downloaded from the \href{http://www.mozilla.org/projects/mathml/fonts/}{Mozilla Web site}.
! To display the mathematical symbols correctly in Internet Explorer, use the alternate, non-normative 
! \href{wsdl20-ie.html}{IE} version of this specification.
  
  
  
! The Z Notation was used to help eliminate problems in the normative text, and to define the test suite coverage.
! However, the Z Notation is non-normative, so any conflict between it and the normative text is resolved in favor of the normative text.
! Readers may nevertheless find the Z Notation useful in cases where the normative text appears to be unclear or ambiguous.
  
  
--- 341,360 ----
  
  
! Since Z Notation is not widely known, it is not included the normative version of this specification.
! However, it is included in two non-normative versions, the \href{wsdl20-z.html}{ZED} and \href{wsdl20-z-ie.html}{ZED-IE} versions.
! Both of these non-normative versions allow the reader to interactively hide and show the Z Notation.
! They differ in the way that they encode the mathematical symbols that are used in Z Notation.
! The ZED version of this specification uses Unicode characters to encode the mathematical symbols
! and is compliant with the W3C Character Model \hyperlink{W3CCharacterModel}{[\textit{Character Model}]}.
! Mozilla Firefox correctly displays the mathematical Unicode characters, provided that the required fonts are installed.
  Mathematical fonts for Mozilla Firefox can be downloaded from the \href{http://www.mozilla.org/projects/mathml/fonts/}{Mozilla Web site}.
! The ZED-IE version of this specification uses font substitution to display the mathematical symbols correctly in Internet Explorer.
  
  
  
! The Z Notation was used to improve the quality of the normative text that defines the Component Model, and to help ensure that the test suite covered
! all important rules implied by the Component Model.
! However, the Z Notation is non-normative, so any conflict between it and the normative text is an error in the Z Notation.
! Readers and implementors may nevertheless find the Z Notation useful in cases where the normative text is unclear.
  
  
***************
*** 363,370 ****
  There are two elements of Z Notation syntax that conflict with the notational conventions described in the preceeding sections.
  In Z Notation, square brackets are used to introduce basic sets, e.g. $[ID]$,
! which conflicts with their use to denote XML Information Set properties
  \hyperlink{xmlinfosetproperties}{\textbf{\ref*{xmlinfosetproperties} XML Infomation Set Properties}}.
  Also, in Z Notation, curly brackets are used to denote set display and set comprehension, e.g. $\{1, 2, 3\}$,
! which conflicts with their use to denote
  WSDL Component Model properties \hyperlink{wsdlcomponentmodelproperties}{\textbf{\ref*{wsdlcomponentmodelproperties} WSDL Component Model Properties}}.
  However, the intended meaning of square and curly brackets should be clear from their context and 
--- 362,369 ----
  There are two elements of Z Notation syntax that conflict with the notational conventions described in the preceeding sections.
  In Z Notation, square brackets are used to introduce basic sets, e.g. $[ID]$,
! which conflicts with the use of square brackets to denote XML Information Set properties
  \hyperlink{xmlinfosetproperties}{\textbf{\ref*{xmlinfosetproperties} XML Infomation Set Properties}}.
  Also, in Z Notation, curly brackets are used to denote set display and set comprehension, e.g. $\{1, 2, 3\}$,
! which conflicts with the use of curly brackets to denote
  WSDL Component Model properties \hyperlink{wsdlcomponentmodelproperties}{\textbf{\ref*{wsdlcomponentmodelproperties} WSDL Component Model Properties}}.
  However, the intended meaning of square and curly brackets should be clear from their context and 
***************
*** 961,964 ****
--- 960,1014 ----
    
    
+ 	  \hypertarget{zed-Base}{}
+ 
+ 	  
+ 	  
+ 	  Many of the component types in the
+ 	  component model have a set of Feature components
+ 	  and a set of Property components, in addition to an identifer.
+ 	  It is convenient to group these common fields into a base Z schema that
+ 	  can be included in other component schemas.
+ 	  
+ 	  
+ 	  
+ 	  Let $Base$ be the common base Z schema for all component types
+ 	  that have an identifier and contain sets of Feature and Property components:
+ 	  
+ 	  
+ 	  \begin{schema}{Base}
+ 		Identifier \\
+ 		Features \\
+ 		Properties
+ 	  \end{schema}
+ 
+ 		\begin{quote}\begin{small}See\begin{itshape} \hyperlink{zed-Identifier}{Identifier}, \hyperlink{zed-Features}{Features}, \hyperlink{zed-Properties}{Properties}.\end{itshape}\end{small}\end{quote}
+ 
+ 	  
+ 	  
+ 	  \hypertarget{zed-BaseRI}{}
+ 
+ 	  
+ 	  
+ 	  The Property and Feature components refered to by a given component
+ 	  must exist in the component model.
+ 	  
+ 	  
+ 	  
+ 	  Let $BaseRI$ be this referential integrity constraint on the
+ 	  base fields of a component:
+ 	  
+ 	  
+ 	  \begin{schema}{BaseRI}
+ 	  	ComponentModel2 \\
+ 	  	Base
+ 	  \where 
+ 	  	features \subseteq  featureIds \\
+ 	  	properties \subseteq  propertyIds
+ 	  \end{schema}
+ 	  
+ 		\begin{quote}\begin{small}See\begin{itshape} \hyperlink{zed-ComponentModel2}{ComponentModel2}, \hyperlink{zed-Base}{Base}.\end{itshape}\end{small}\end{quote}
+ 		
+ 	  
+ 	  
    
    Properties are unordered and unique  
***************
*** 1611,1665 ****
  	  \end{itemize}
  	  
- 	  \hypertarget{zed-Base}{}
- 
- 	  
- 	  
- 	  The Interface component is typical of many of the component types in the
- 	  component model in that it has an identifer, a set of Feature components,
- 	  and a set of Property components.
- 	  It is convenient to group these common fields into a base Z schema that
- 	  can be included in other component schemas.
- 	  
- 	  
- 	  
- 	  Let $Base$ be the common base Z schema for all component types
- 	  that have an identifier and contain sets of Feature and Property components:
- 	  
- 	  
- 	  \begin{schema}{Base}
- 		Identifier \\
- 		Features \\
- 		Properties
- 	  \end{schema}
- 
- 		\begin{quote}\begin{small}See\begin{itshape} \hyperlink{zed-Identifier}{Identifier}, \hyperlink{zed-Features}{Features}, \hyperlink{zed-Properties}{Properties}.\end{itshape}\end{small}\end{quote}
- 
- 	  
- 	  
- 	  \hypertarget{zed-BaseRI}{}
- 
- 	  
- 	  
- 	  The Property and Feature components refered to by a given component
- 	  must exist in the component model.
- 	  
- 	  
- 	  
- 	  Let $BaseRI$ be this referential integrity constraint on the
- 	  base fields of a component:
- 	  
- 	  
- 	  \begin{schema}{BaseRI}
- 	  	ComponentModel2 \\
- 	  	Base
- 	  \where 
- 	  	inScopeFeatures \subseteq  featureIds \\
- 	  	inScopeProperties \subseteq  propertyIds
- 	  \end{schema}
- 	  
- 		\begin{quote}\begin{small}See\begin{itshape} \hyperlink{zed-ComponentModel2}{ComponentModel2}, \hyperlink{zed-Base}{Base}.\end{itshape}\end{small}\end{quote}
- 		
- 	  
- 	  
  \hypertarget{zed-Interface}{}
  	
--- 1661,1664 ----
***************
*** 3684,3692 ****
  	  	Many of the component types in the component model contain a \{features\} property, which is
  	  	a set of Feature components.
- 	  	The \{features\} property contains a subset of Feature components that are declared directly
- 	  	in the given component. 
  	  	We refer to these as the \textit{declared features} of the component.
  	  	Furthermore, the \{features\} property is itself a subset of Feature components that are required 
! 	  	or available for the given component.
  	  	We refer to these as the \textit{in-scope features} of the component.
  	  
--- 3683,3689 ----
  	  	Many of the component types in the component model contain a \{features\} property, which is
  	  	a set of Feature components.
  	  	We refer to these as the \textit{declared features} of the component.
  	  	Furthermore, the \{features\} property is itself a subset of Feature components that are required 
! 	  	or available for the given component as determined by the Feature Composition Model.
  	  	We refer to these as the \textit{in-scope features} of the component.
  	  
***************
*** 3698,3708 ****
        \begin{schema}{Features}
  			features : \power  ID \\
- 			declaredFeatures : \power  ID \\
  			inScopeFeatures : \power  ID
  		\where 
! 			declaredFeatures \subseteq  features \subseteq  inScopeFeatures
        \end{schema}
        
        \begin{quote}\begin{small}See\begin{itshape} \hyperlink{zed-ID}{ID}.\end{itshape}\end{small}\end{quote}
  
  	  
--- 3695,3708 ----
        \begin{schema}{Features}
  			features : \power  ID \\
  			inScopeFeatures : \power  ID
  		\where 
! 			features \subseteq  inScopeFeatures
        \end{schema}
        
        \begin{quote}\begin{small}See\begin{itshape} \hyperlink{zed-ID}{ID}.\end{itshape}\end{small}\end{quote}
+       
+       \begin{itemize}
+       \item The in-scope features for a component always include the declared features for that component.
+       \end{itemize}
  
  	  
***************
*** 4149,4157 ****
  	  	Many of the component types in the component model contain a \{properties\} property, which is
  	  	a set of Property components.
- 	  	The \{properties\} property contains a subset of Property components that are declared directly
- 	  	in the given component. 
  	  	We refer to these as the \textit{declared properties} of the component.
  	  	Furthermore, the \{properties\} property is itself a subset of Property components that are required 
! 	  	or available for the given component.
  	  	We refer to these as the \textit{in-scope properties} of the component.
  	  
--- 4149,4155 ----
  	  	Many of the component types in the component model contain a \{properties\} property, which is
  	  	a set of Property components.
  	  	We refer to these as the \textit{declared properties} of the component.
  	  	Furthermore, the \{properties\} property is itself a subset of Property components that are required 
! 	  	or available for the given component as determined by the Property Composition Model.
  	  	We refer to these as the \textit{in-scope properties} of the component.
  	  
***************
*** 4163,4174 ****
        \begin{schema}{Properties}
  			properties : \power  ID \\
- 			declaredProperties : \power  ID \\
  			inScopeProperties : \power  ID
  		\where 
! 			declaredProperties \subseteq  properties \subseteq  inScopeProperties
        \end{schema}
        
        \begin{quote}\begin{small}See\begin{itshape} \hyperlink{zed-ID}{ID}.\end{itshape}\end{small}\end{quote}
  
  	  
      
--- 4161,4175 ----
        \begin{schema}{Properties}
  			properties : \power  ID \\
  			inScopeProperties : \power  ID
  		\where 
! 			properties \subseteq  inScopeProperties
        \end{schema}
        
        \begin{quote}\begin{small}See\begin{itshape} \hyperlink{zed-ID}{ID}.\end{itshape}\end{small}\end{quote}
  
+       \begin{itemize}
+       \item The in-scope properties for a component always include the declared properties for that component.
+       \end{itemize}
+ 
  	  
      
***************
*** 9175,9178 ****
--- 9176,9185 ----
      
      
+     	20050320&
+     	AGR&
+     	Rename Z Notation versions as wsdl20-z.html and wsdl20-z-ie-html.
+     \\ \hline 
+     
+     
      	20050315&
      	AGR&

Index: zml.css
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/zml.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** zml.css	27 Dec 2004 22:09:21 -0000	1.4
--- zml.css	20 Mar 2005 19:35:10 -0000	1.5
***************
*** 23,26 ****
--- 23,30 ----
  	ChangeLog:
  	
+ 	2005-03-20: Arthur Ryman <ryman@ca.ibm.com>
+ 	- make Z Notation initially visible in non-normative version
+ 	since it is now hidden in normative version
+ 	
  	2004-12-26: Arthur Ryman <ryman@ca.ibm.com>
  	- added div.twisty-head, div.twisty-body, img.twisty-icon
***************
*** 274,285 ****
  }
  
! /* twisty head is initially displayed */
  div.twisty-head {
! 	display: block;
  }
  
! /* twist body is initially hidden */
  div.twisty-body {
! 	display: none;
  }
  
--- 278,289 ----
  }
  
! /* twisty head is initially hidden */
  div.twisty-head {
! 	display: none;
  }
  
! /* twist body is initially displayed */
  div.twisty-body {
! 	display: block;
  }
  

Index: wsdl20.toc
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20.toc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wsdl20.toc	14 Mar 2005 22:40:16 -0000	1.15
--- wsdl20.toc	20 Mar 2005 19:35:10 -0000	1.16
***************
*** 15,22 ****
  \contentsline {subsection}{\numberline {2.1.1}The Description Component}{21}{subsection.2.1.1}
  \contentsline {subsection}{\numberline {2.1.2}XML Representation of Description Component}{25}{subsection.2.1.2}
! \contentsline {subsubsection}{\texttt {targetNamespace} \textit {attribute information item}}{26}{section*.3}
! \contentsline {subsection}{\numberline {2.1.3}Mapping Description's XML Representation to Component Properties}{26}{subsection.2.1.3}
! \contentsline {section}{\numberline {2.2}Interface}{27}{section.2.2}
! \contentsline {subsection}{\numberline {2.2.1}The Interface Component}{27}{subsection.2.2.1}
  \contentsline {subsection}{\numberline {2.2.2}XML Representation of Interface Component}{31}{subsection.2.2.2}
  \contentsline {subsubsection}{\texttt {name} \textit {attribute information item} with \texttt {interface} [owner]}{32}{section*.4}
--- 15,22 ----
  \contentsline {subsection}{\numberline {2.1.1}The Description Component}{21}{subsection.2.1.1}
  \contentsline {subsection}{\numberline {2.1.2}XML Representation of Description Component}{25}{subsection.2.1.2}
! \contentsline {subsubsection}{\texttt {targetNamespace} \textit {attribute information item}}{27}{section*.3}
! \contentsline {subsection}{\numberline {2.1.3}Mapping Description's XML Representation to Component Properties}{27}{subsection.2.1.3}
! \contentsline {section}{\numberline {2.2}Interface}{28}{section.2.2}
! \contentsline {subsection}{\numberline {2.2.1}The Interface Component}{28}{subsection.2.2.1}
  \contentsline {subsection}{\numberline {2.2.2}XML Representation of Interface Component}{31}{subsection.2.2.2}
  \contentsline {subsubsection}{\texttt {name} \textit {attribute information item} with \texttt {interface} [owner]}{32}{section*.4}

Index: wsdl20.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20.xml,v
retrieving revision 1.191
retrieving revision 1.192
diff -C2 -d -r1.191 -r1.192
*** wsdl20.xml	16 Mar 2005 23:13:34 -0000	1.191
--- wsdl20.xml	20 Mar 2005 19:35:10 -0000	1.192
***************
*** 339,344 ****
  
  <p>
! Z Notation <bibref ref="ZNotationReferenceManual"/> was used in the development of this specification
! to formalize the WSDL Component Model.
  Z Notation is a formal specification language that is based on standard mathematical notation. 
  The Z Notation for this specification has been verified using the
--- 339,343 ----
  
  <p>
! Z Notation <bibref ref="ZNotationReferenceManual"/> was used in the development of this specification.
  Z Notation is a formal specification language that is based on standard mathematical notation. 
  The Z Notation for this specification has been verified using the
***************
*** 347,366 ****
  
  <p>
! Since Z Notation is not widely known, it is not part of the normative version of this specification.
! However, it is included in two non-normative versions.
! The non-normative <loc href="wsdl20-i.html">DHTML</loc> version of this specification allows the reader to interactively
! hide and show the Z Notation.
! The DHTML version of this specification is compliant with the W3C Character Model <bibref ref="W3CCharacterModel"/>
! which uses Unicode characters to encode the mathematical symbols that appear in Z Notation.
! Mozilla Firefox correctly displays Unicode characters, provided that the required fonts are installed.
  Mathematical fonts for Mozilla Firefox can be downloaded from the <loc href="http://www.mozilla.org/projects/mathml/fonts/">Mozilla Web site</loc>.
! To display the mathematical symbols correctly in Internet Explorer, use the alternate, non-normative 
! <loc href="wsdl20-ie.html">IE</loc> version of this specification.
  </p>
  
  <p>
! The Z Notation was used to help eliminate problems in the normative text, and to define the test suite coverage.
! However, the Z Notation is non-normative, so any conflict between it and the normative text is resolved in favor of the normative text.
! Readers may nevertheless find the Z Notation useful in cases where the normative text appears to be unclear or ambiguous.
  </p>
  
--- 346,365 ----
  
  <p>
! Since Z Notation is not widely known, it is not included the normative version of this specification.
! However, it is included in two non-normative versions, the <loc href="wsdl20-z.html">ZED</loc> and <loc href="wsdl20-z-ie.html">ZED-IE</loc> versions.
! Both of these non-normative versions allow the reader to interactively hide and show the Z Notation.
! They differ in the way that they encode the mathematical symbols that are used in Z Notation.
! The ZED version of this specification uses Unicode characters to encode the mathematical symbols
! and is compliant with the W3C Character Model <bibref ref="W3CCharacterModel"/>.
! Mozilla Firefox correctly displays the mathematical Unicode characters, provided that the required fonts are installed.
  Mathematical fonts for Mozilla Firefox can be downloaded from the <loc href="http://www.mozilla.org/projects/mathml/fonts/">Mozilla Web site</loc>.
! The ZED-IE version of this specification uses font substitution to display the mathematical symbols correctly in Internet Explorer.
  </p>
  
  <p>
! The Z Notation was used to improve the quality of the normative text that defines the Component Model, and to help ensure that the test suite covered
! all important rules implied by the Component Model.
! However, the Z Notation is non-normative, so any conflict between it and the normative text is an error in the Z Notation.
! Readers and implementors may nevertheless find the Z Notation useful in cases where the normative text is unclear.
  </p>
  
***************
*** 368,375 ****
  There are two elements of Z Notation syntax that conflict with the notational conventions described in the preceeding sections.
  In Z Notation, square brackets are used to introduce basic sets, e.g. <z:math>[ID]</z:math>,
! which conflicts with their use to denote XML Information Set properties
  <specref ref="xmlinfosetproperties" />.
  Also, in Z Notation, curly brackets are used to denote set display and set comprehension, e.g. <z:math>{1, 2, 3}</z:math>,
! which conflicts with their use to denote
  WSDL Component Model properties <specref ref="wsdlcomponentmodelproperties" />.
  However, the intended meaning of square and curly brackets should be clear from their context and 
--- 367,374 ----
  There are two elements of Z Notation syntax that conflict with the notational conventions described in the preceeding sections.
  In Z Notation, square brackets are used to introduce basic sets, e.g. <z:math>[ID]</z:math>,
! which conflicts with the use of square brackets to denote XML Information Set properties
  <specref ref="xmlinfosetproperties" />.
  Also, in Z Notation, curly brackets are used to denote set display and set comprehension, e.g. <z:math>{1, 2, 3}</z:math>,
! which conflicts with the use of curly brackets to denote
  WSDL Component Model properties <specref ref="wsdlcomponentmodelproperties" />.
  However, the intended meaning of square and curly brackets should be clear from their context and 
***************
*** 950,953 ****
--- 949,1001 ----
    </z:notation>
    
+ 	  <z:notation name="Base">
+ 	  
+ 	  <p>
+ 	  Many of the component types in the
+ 	  component model have a set of Feature components
+ 	  and a set of Property components, in addition to an identifer.
+ 	  It is convenient to group these common fields into a base Z schema that
+ 	  can be included in other component schemas.
+ 	  </p>
+ 	  
+ 	  <p>
+ 	  Let <z:i>Base</z:i> be the common base Z schema for all component types
+ 	  that have an identifier and contain sets of Feature and Property components:
+ 	  </p>
+ 	  
+ 	  <schema xmlns="http://www.w3.org/2004/zml" name="Base">
+ 		Identifier <nl/>
+ 		Features <nl/>
+ 		Properties
+ 	  </schema>
+ 
+ 		<z:see names="Identifier Features Properties"/>
+ 
+ 	  </z:notation>
+ 	  
+ 	  <z:notation name="BaseRI">
+ 	  
+ 	  <p>
+ 	  The Property and Feature components refered to by a given component
+ 	  must exist in the component model.
+ 	  </p>
+ 	  
+ 	  <p>
+ 	  Let <z:i>BaseRI</z:i> be this referential integrity constraint on the
+ 	  base fields of a component:
+ 	  </p>
+ 	  
+ 	  <schema xmlns="http://www.w3.org/2004/zml" name="BaseRI">
+ 	  	ComponentModel2 <nl/>
+ 	  	Base
+ 	  <where/>
+ 	  	features <subseteq/> featureIds <nl/>
+ 	  	properties <subseteq/> propertyIds
+ 	  </schema>
+ 	  
+ 		<z:see names="ComponentModel2 Base"/>
+ 		
+ 	  </z:notation>
+ 	  
    <p>
    Properties are unordered and unique  
***************
*** 1595,1647 ****
  	  </ulist>
  	  
- 	  <z:notation name="Base">
- 	  
- 	  <p>
- 	  The Interface component is typical of many of the component types in the
- 	  component model in that it has an identifer, a set of Feature components,
- 	  and a set of Property components.
- 	  It is convenient to group these common fields into a base Z schema that
- 	  can be included in other component schemas.
- 	  </p>
- 	  
- 	  <p>
- 	  Let <z:i>Base</z:i> be the common base Z schema for all component types
- 	  that have an identifier and contain sets of Feature and Property components:
- 	  </p>
- 	  
- 	  <schema xmlns="http://www.w3.org/2004/zml" name="Base">
- 		Identifier <nl/>
- 		Features <nl/>
- 		Properties
- 	  </schema>
- 
- 		<z:see names="Identifier Features Properties"/>
- 
- 	  </z:notation>
- 	  
- 	  <z:notation name="BaseRI">
- 	  
- 	  <p>
- 	  The Property and Feature components refered to by a given component
- 	  must exist in the component model.
- 	  </p>
- 	  
- 	  <p>
- 	  Let <z:i>BaseRI</z:i> be this referential integrity constraint on the
- 	  base fields of a component:
- 	  </p>
- 	  
- 	  <schema xmlns="http://www.w3.org/2004/zml" name="BaseRI">
- 	  	ComponentModel2 <nl/>
- 	  	Base
- 	  <where/>
- 	  	inScopeFeatures <subseteq/> featureIds <nl/>
- 	  	inScopeProperties <subseteq/> propertyIds
- 	  </schema>
- 	  
- 		<z:see names="ComponentModel2 Base"/>
- 		
- 	  </z:notation>
- 	  
  <z:notation name="Interface">	
  <p>Let <z:i>Interface</z:i> be the set of all Interface components:</p>
--- 1643,1646 ----
***************
*** 3629,3637 ****
  	  	Many of the component types in the component model contain a {features} property, which is
  	  	a set of Feature components.
- 	  	The {features} property contains a subset of Feature components that are declared directly
- 	  	in the given component. 
  	  	We refer to these as the <emph>declared features</emph> of the component.
  	  	Furthermore, the {features} property is itself a subset of Feature components that are required 
! 	  	or available for the given component.
  	  	We refer to these as the <emph>in-scope features</emph> of the component.
  	  </p>
--- 3628,3634 ----
  	  	Many of the component types in the component model contain a {features} property, which is
  	  	a set of Feature components.
  	  	We refer to these as the <emph>declared features</emph> of the component.
  	  	Furthermore, the {features} property is itself a subset of Feature components that are required 
! 	  	or available for the given component as determined by the Feature Composition Model.
  	  	We refer to these as the <emph>in-scope features</emph> of the component.
  	  </p>
***************
*** 3643,3653 ****
        <schema xmlns="http://www.w3.org/2004/zml" name="Features">
  			features : <power/> ID <nl/>
- 			declaredFeatures : <power/> ID <nl/>
  			inScopeFeatures : <power/> ID
  		<where/>
! 			declaredFeatures <subseteq/> features <subseteq/> inScopeFeatures
        </schema>
        
        <z:see names="ID"/>
  
  	  </z:notation>
--- 3640,3653 ----
        <schema xmlns="http://www.w3.org/2004/zml" name="Features">
  			features : <power/> ID <nl/>
  			inScopeFeatures : <power/> ID
  		<where/>
! 			features <subseteq/> inScopeFeatures
        </schema>
        
        <z:see names="ID"/>
+       
+       <ulist>
+       <item><p>The in-scope features for a component always include the declared features for that component.</p></item>
+       </ulist>
  
  	  </z:notation>
***************
*** 4079,4087 ****
  	  	Many of the component types in the component model contain a {properties} property, which is
  	  	a set of Property components.
- 	  	The {properties} property contains a subset of Property components that are declared directly
- 	  	in the given component. 
  	  	We refer to these as the <emph>declared properties</emph> of the component.
  	  	Furthermore, the {properties} property is itself a subset of Property components that are required 
! 	  	or available for the given component.
  	  	We refer to these as the <emph>in-scope properties</emph> of the component.
  	  </p>
--- 4079,4085 ----
  	  	Many of the component types in the component model contain a {properties} property, which is
  	  	a set of Property components.
  	  	We refer to these as the <emph>declared properties</emph> of the component.
  	  	Furthermore, the {properties} property is itself a subset of Property components that are required 
! 	  	or available for the given component as determined by the Property Composition Model.
  	  	We refer to these as the <emph>in-scope properties</emph> of the component.
  	  </p>
***************
*** 4093,4104 ****
        <schema xmlns="http://www.w3.org/2004/zml" name="Properties">
  			properties : <power/> ID <nl/>
- 			declaredProperties : <power/> ID <nl/>
  			inScopeProperties : <power/> ID
  		<where/>
! 			declaredProperties <subseteq/> properties <subseteq/> inScopeProperties
        </schema>
        
        <z:see names="ID"/>
  
  	  </z:notation>
      
--- 4091,4105 ----
        <schema xmlns="http://www.w3.org/2004/zml" name="Properties">
  			properties : <power/> ID <nl/>
  			inScopeProperties : <power/> ID
  		<where/>
! 			properties <subseteq/> inScopeProperties
        </schema>
        
        <z:see names="ID"/>
  
+       <ulist>
+       <item><p>The in-scope properties for a component always include the declared properties for that component.</p></item>
+       </ulist>
+ 
  	  </z:notation>
      
***************
*** 8939,8942 ****
--- 8940,8949 ----
      
      <tr>
+     	<td>20050320</td>
+     	<td>AGR</td>
+     	<td>Rename Z Notation versions as wsdl20-z.html and wsdl20-z-ie-html.</td>
+     </tr>
+     
+     <tr>
      	<td>20050315</td>
      	<td>AGR</td>

--- wsdl20-ie.html DELETED ---

--- wsdl20-i.html DELETED ---

--- NEW FILE: wsdl20-z.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="en"><head><META http-equiv="Content-Type" content="text/html; charset=utf-8"><title>Web Services Description Language (WSDL) Version 2.0 Part 1: Core Language</title><style type="text/css">
code           { font-family: monospace; }

div.constraint,
div.issue,
div.note,
div.notice     { margin-left: 2em; }

dt.label       { display: run-in; }

li, p           { margin-top: 0.3em;
                 margin-bottom: 0.3em; }

.diff-chg	{ background-color: yellow; }
.diff-del	{ background-color: red; text-decoration: line-through;}
.diff-add	{ background-color: lime; }

table          { empty-cells: show; }
[...9837 lines suppressed...]
    </tr>
    <tr>
       <td rowspan="1" colspan="1">20020620</td>
       <td rowspan="1" colspan="1">SW</td>
       <td rowspan="1" colspan="1">Started adding abstract model</td>
    </tr>
    <tr>
       <td rowspan="1" colspan="1">20020406</td>
       <td rowspan="1" colspan="1">SW</td>
       <td rowspan="1" colspan="1">Created document from WSDL 1.1</td>
    </tr>
  </tbody>
</table><br>

      </div>
    </div>

  </div>

</body></html>
Index: wsdl20.pdf
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20.pdf,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** wsdl20.pdf	16 Mar 2005 23:13:33 -0000	1.20
--- wsdl20.pdf	20 Mar 2005 19:35:09 -0000	1.21
***************
*** 820,832 ****
  endobj
  553 0 obj <<
! /Length 993       
  /Filter /FlateDecode
  >>
  stream
! xڝVKo6W@% Dz]'-c4njmɡRNngA2܋{<IX^K䅷Mg/fe%lHɰ<9hʜ2G7ɷmD8bo@,'ѯ<xOӉIq[VA^:I{Z:
! EP.yfCtNa{:VT&	S@d䟳fMM)%! xGv4glٴ'4@g0l̫^L*ʴݱuםFdj)Eo5b2^	hR['t ܭVMxV@rN'(T
yi0cC1OFut PqfL*wfjoKpCQRseT
! rY4'onIwVCհ
MU׮j۵VCЖ2ܪǭ-7cy:Ѝ6$*m<oO`{Lx
[...26790 lines suppressed...]
! 0000762874 00000 n 
! 0000763000 00000 n 
! 0000763126 00000 n 
! 0000763206 00000 n 
! 0000763307 00000 n 
! 0000776250 00000 n 
! 0000793524 00000 n 
! 0000793565 00000 n 
! 0000793605 00000 n 
! 0000793797 00000 n 
  trailer
  <<
! /Size 2615
! /Root 2613 0 R
! /Info 2614 0 R
! /ID [<66E5B515E9671F3B6FBEEE9099A0ED86> <66E5B515E9671F3B6FBEEE9099A0ED86>]
  >>
  startxref
! 794045
  %%EOF

Index: wsdl20.html
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20.html,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -d -r1.162 -r1.163
*** wsdl20.html	16 Mar 2005 23:13:33 -0000	1.162
--- wsdl20.html	20 Mar 2005 19:35:09 -0000	1.163
***************
*** 340,345 ****
  
  <p>
! Z Notation [<cite><a href="#ZNotationReferenceManual">Z Notation Reference Manual</a></cite>] was used in the development of this specification
! to formalize the WSDL Component Model.
  Z Notation is a formal specification language that is based on standard mathematical notation. 
  The Z Notation for this specification has been verified using the
--- 340,344 ----
  
  <p>
! Z Notation [<cite><a href="#ZNotationReferenceManual">Z Notation Reference Manual</a></cite>] was used in the development of this specification.
  Z Notation is a formal specification language that is based on standard mathematical notation. 
  The Z Notation for this specification has been verified using the
***************
*** 348,367 ****
  
  <p>
! Since Z Notation is not widely known, it is not part of the normative version of this specification.
! However, it is included in two non-normative versions.
! The non-normative <a href="wsdl20-i.html">DHTML</a> version of this specification allows the reader to interactively
! hide and show the Z Notation.
! The DHTML version of this specification is compliant with the W3C Character Model [<cite><a href="#W3CCharacterModel">Character Model</a></cite>]
! which uses Unicode characters to encode the mathematical symbols that appear in Z Notation.
! Mozilla Firefox correctly displays Unicode characters, provided that the required fonts are installed.
  Mathematical fonts for Mozilla Firefox can be downloaded from the <a href="http://www.mozilla.org/projects/mathml/fonts/">Mozilla Web site</a>.
! To display the mathematical symbols correctly in Internet Explorer, use the alternate, non-normative 
! <a href="wsdl20-ie.html">IE</a> version of this specification.
  </p>
  
  <p>
! The Z Notation was used to help eliminate problems in the normative text, and to define the test suite coverage.
! However, the Z Notation is non-normative, so any conflict between it and the normative text is resolved in favor of the normative text.
! Readers may nevertheless find the Z Notation useful in cases where the normative text appears to be unclear or ambiguous.
  </p>
  
--- 347,366 ----
  
  <p>
! Since Z Notation is not widely known, it is not included the normative version of this specification.
! However, it is included in two non-normative versions, the <a href="wsdl20-z.html">ZED</a> and <a href="wsdl20-z-ie.html">ZED-IE</a> versions.
! Both of these non-normative versions allow the reader to interactively hide and show the Z Notation.
! They differ in the way that they encode the mathematical symbols that are used in Z Notation.
! The ZED version of this specification uses Unicode characters to encode the mathematical symbols
! and is compliant with the W3C Character Model [<cite><a href="#W3CCharacterModel">Character Model</a></cite>].
! Mozilla Firefox correctly displays the mathematical Unicode characters, provided that the required fonts are installed.
  Mathematical fonts for Mozilla Firefox can be downloaded from the <a href="http://www.mozilla.org/projects/mathml/fonts/">Mozilla Web site</a>.
! The ZED-IE version of this specification uses font substitution to display the mathematical symbols correctly in Internet Explorer.
  </p>
  
  <p>
! The Z Notation was used to improve the quality of the normative text that defines the Component Model, and to help ensure that the test suite covered
! all important rules implied by the Component Model.
! However, the Z Notation is non-normative, so any conflict between it and the normative text is an error in the Z Notation.
! Readers and implementors may nevertheless find the Z Notation useful in cases where the normative text is unclear.
  </p>
  
***************
*** 369,376 ****
  There are two elements of Z Notation syntax that conflict with the notational conventions described in the preceeding sections.
  In Z Notation, square brackets are used to introduce basic sets, e.g. [<span class="zi">ID</span>],
! which conflicts with their use to denote XML Information Set properties
  <a href="#xmlinfosetproperties"><b>1.3.4 XML Infomation Set Properties</b></a>.
  Also, in Z Notation, curly brackets are used to denote set display and set comprehension, e.g. {1<span class="zprefix">,</span> 2<span class="zprefix">,</span> 3},
! which conflicts with their use to denote
  WSDL Component Model properties <a href="#wsdlcomponentmodelproperties"><b>1.3.5 WSDL Component Model Properties</b></a>.
  However, the intended meaning of square and curly brackets should be clear from their context and 
--- 368,375 ----
  There are two elements of Z Notation syntax that conflict with the notational conventions described in the preceeding sections.
  In Z Notation, square brackets are used to introduce basic sets, e.g. [<span class="zi">ID</span>],
! which conflicts with the use of square brackets to denote XML Information Set properties
  <a href="#xmlinfosetproperties"><b>1.3.4 XML Infomation Set Properties</b></a>.
  Also, in Z Notation, curly brackets are used to denote set display and set comprehension, e.g. {1<span class="zprefix">,</span> 2<span class="zprefix">,</span> 3},
! which conflicts with the use of curly brackets to denote
  WSDL Component Model properties <a href="#wsdlcomponentmodelproperties"><b>1.3.5 WSDL Component Model Properties</b></a>.
  However, the intended meaning of square and curly brackets should be clear from their context and 
***************
*** 480,483 ****
--- 479,486 ----
    <a name="zed-ComponentModel2"></a>
    
+ 	  <a name="zed-Base"></a>
+ 	  
+ 	  <a name="zed-BaseRI"></a>
+ 	  
    <p>
    Properties are unordered and unique  
***************
*** 940,947 ****
  	  </ul>
  	  
- 	  <a name="zed-Base"></a>
- 	  
- 	  <a name="zed-BaseRI"></a>
- 	  
  <a name="zed-Interface"></a>
  
--- 943,946 ----
***************
*** 7507,7510 ****
--- 7506,7515 ----
      
      <tr>
+     	<td rowspan="1" colspan="1">20050320</td>
+     	<td rowspan="1" colspan="1">AGR</td>
+     	<td rowspan="1" colspan="1">Rename Z Notation versions as wsdl20-z.html and wsdl20-z-ie-html.</td>
+     </tr>
+     
+     <tr>
      	<td rowspan="1" colspan="1">20050315</td>
      	<td rowspan="1" colspan="1">AGR</td>

Received on Sunday, 20 March 2005 19:35:16 UTC