2002/ws/desc/wsdl20 wsdl20.html,1.189,1.190 wsdl20.xml,1.270,1.271 wsdl20.tex,1.49,1.50 build.xml,1.20,1.21 wsdl20.toc,1.28,1.29 wsdl20-z-ie.html,1.17,1.18 wsdl20-z.html,1.31,1.32 .cvsignore,1.6,1.7 wsdl20.pdf,1.37,NONE

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

Modified Files:
	wsdl20.html wsdl20.xml wsdl20.tex build.xml wsdl20.toc 
	wsdl20-z-ie.html wsdl20-z.html .cvsignore 
Removed Files:
	wsdl20.pdf 
Log Message:
Added final ComponentModel to Z Notation.

Index: .cvsignore
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** .cvsignore	18 Jan 2005 19:09:10 -0000	1.6
--- .cvsignore	25 May 2005 21:30:52 -0000	1.7
***************
*** 6,10 ****
  valid-xml.txt
  .project
- wsdl20.ps
  wsdl20.txt
  html2ps.dbg
--- 6,9 ----
***************
*** 12,14 ****
  *.aux
  *.log
! *.out
\ No newline at end of file
--- 11,16 ----
  *.aux
  *.log
! *.out
! *.dvi
! *.ps
! *.pdf
\ No newline at end of file

Index: build.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** build.xml	23 May 2005 00:53:22 -0000	1.20
--- build.xml	25 May 2005 21:30:50 -0000	1.21
***************
*** 27,30 ****
--- 27,33 ----
  	ChangeLog:
  	
+ 	2005-05-25: Arthur Ryman <ryman@ca.ibm.com>
+ 	- do not generate pdf to work around a problem in pdflatex
+ 	
  	2005-05-20: Arthur Ryman <ryman@ca.ibm.com>
  	- do lenient validation of only xsl
***************
*** 85,89 ****
  <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." />
--- 88,92 ----
  <project name="wsdl20" default="main" basedir=".">
  
! 	<target name="main" depends="validate, typecheck, html, html-z, html-z-ie" description="Creates all output files." />
  
  	<target name="rebuild" depends="clean, main" description="Creates all output files from scratch." />
***************
*** 118,122 ****
  
  	<target name="latex" description="Transforms wsdl20.xml into wsdl20.tex">
! 		<xslt in="wsdl20.xml" out="wsdl20.tex" style="xmlspec2latex.xsl" />
  	</target>
  	
--- 121,125 ----
  
  	<target name="latex" description="Transforms wsdl20.xml into wsdl20.tex">
! 		<xslt in="wsdl20.xml" out="wsdl20.tex" style="xmlspec2latex.xsl" force="yes" />
  	</target>
  	
***************
*** 127,130 ****
--- 130,151 ----
  	</target>
  	
+ 	<target name="pdflatex" description="Formats tex into pdf using pdflatex.">
+ 		<exec executable="pdflatex">
+ 			<arg line="wsdl20"/>
+ 		</exec>
+ 	</target>
+ 	
+ 	<target name="dvi" description="Formats tex into dvi using latex.">
+ 		<exec executable="latex">
+ 			<arg line="wsdl20"/>
+ 		</exec>
+ 	</target>
+ 	
+ 	<target name="ps" description="Formats dvi into PostScript using dvips.">
+ 		<exec executable="dvips">
+ 			<arg line="wsdl20"/>
+ 		</exec>
+ 	</target>
+ 	
  	<target name="elements" description="Lists all elements.">
  		<xslt in="wsdl20.xml" out="wsdl20-elements.txt" style="elements.xsl" />

Index: wsdl20-z-ie.html
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20-z-ie.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wsdl20-z-ie.html	23 May 2005 00:53:21 -0000	1.17
--- wsdl20-z-ie.html	25 May 2005 21:30:50 -0000	1.18
***************
*** 493,496 ****
--- 493,526 ----
    </p>
    
+   <a name="zed-ComponentModel"></a><div id="twisty-head-zed-ComponentModel" class="twisty-head"><img src="images/left-twisty-13.png" alt="" class="twisty-icon"><a onclick="show('zed-ComponentModel')">ComponentModel</a>...</div><div id="twisty-body-zed-ComponentModel" class="twisty-body"><img src="images/down-twisty-13.png" alt="" class="twisty-icon"><a onclick="hide('zed-ComponentModel')">ComponentModel</a>&nbsp;&nbsp;[&nbsp;<a onClick="showAll()" href="#zed-ComponentModel">show all</a>&nbsp;]&nbsp;&nbsp;[&nbsp;<a onClick="hideAll()" href="#zed-ComponentModel">hide all</a>&nbsp;]<br>
+ 
+   <p>
+   	A WSDL 2.0 document, and its related documents, defines a set of
+   	components that together form an instance of a Component Model.
+   	This specification defines the structure and constraints on the
+   	components in a valid component model instance.
[...2303 lines suppressed...]
  
***************
*** 9871,9874 ****
--- 10257,10272 ----
      
      <tr>
+     	<td rowspan="1" colspan="1">20050525</td>
+     	<td rowspan="1" colspan="1">AGR</td>
+     	<td rowspan="1" colspan="1">Added final ComponentModel to Z Notation.</td>
+     </tr>
+ 
+     <tr>
+     	<td rowspan="1" colspan="1">20050523</td>
+     	<td rowspan="1" colspan="1">AGR</td>
+     	<td rowspan="1" colspan="1">Reordered some paragraphs to improve consistency.</td>
+     </tr>
+ 
+     <tr>
      	<td rowspan="1" colspan="1">20050522</td>
      	<td rowspan="1" colspan="1">AGR</td>

Index: wsdl20.tex
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20.tex,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** wsdl20.tex	23 May 2005 00:53:21 -0000	1.49
--- wsdl20.tex	25 May 2005 21:30:50 -0000	1.50
***************
*** 484,487 ****
--- 484,536 ----
    
    
+   \hypertarget{zed-ComponentModel}{}
+ 
+ 
+   
+   	A WSDL 2.0 document, and its related documents, defines a set of
+   	components that together form an instance of a Component Model.
+   	This specification defines the structure and constraints on the
[...2829 lines suppressed...]
  
***************
*** 10799,10802 ****
--- 11296,11311 ----
      
      
+     	20050525&
+     	AGR&
+     	Added final ComponentModel to Z Notation.
+     \\ \hline 
+ 
+     
+     	20050523&
+     	AGR&
+     	Reordered some paragraphs to improve consistency.
+     \\ \hline 
+ 
+     
      	20050522&
      	AGR&

Index: wsdl20.toc
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20.toc,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** wsdl20.toc	23 May 2005 00:53:21 -0000	1.28
--- wsdl20.toc	25 May 2005 21:30:50 -0000	1.29
***************
*** 1,195 ****
- \contentsline {chapter}{\numberline {1}Introduction}{7}{chapter.1}
- \contentsline {section}{\numberline {1.1}Web Service}{7}{section.1.1}
- \contentsline {section}{\numberline {1.2}Document Conformance}{8}{section.1.2}
- \contentsline {section}{\numberline {1.3}The Meaning of a Service Description}{8}{section.1.3}
- \contentsline {section}{\numberline {1.4}Notational Conventions}{9}{section.1.4}
- \contentsline {subsection}{\numberline {1.4.1}RFC 2119 Keywords}{9}{subsection.1.4.1}
- \contentsline {subsection}{\numberline {1.4.2}RFC 3986 Namespaces}{9}{subsection.1.4.2}
- \contentsline {subsection}{\numberline {1.4.3}Prefixes and Namespaces Used in This Specification}{9}{subsection.1.4.3}
- \contentsline {subsection}{\numberline {1.4.4}Terms Used in This Specification}{10}{subsection.1.4.4}
- \contentsline {subsection}{\numberline {1.4.5}XML Information Set Properties}{10}{subsection.1.4.5}
- \contentsline {subsection}{\numberline {1.4.6}WSDL 2.0 Component Model Properties}{10}{subsection.1.4.6}
- \contentsline {subsection}{\numberline {1.4.7}Z Notation}{10}{subsection.1.4.7}
- \contentsline {subsection}{\numberline {1.4.8}BNF Pseudo-Schemas}{11}{subsection.1.4.8}
- \contentsline {chapter}{\numberline {2}Component Model}{12}{chapter.2}
- \contentsline {section}{\numberline {2.1}Description}{23}{section.2.1}
- \contentsline {subsection}{\numberline {2.1.1}The Description Component}{23}{subsection.2.1.1}
- \contentsline {subsection}{\numberline {2.1.2}XML Representation of Description Component}{27}{subsection.2.1.2}
- \contentsline {subsubsection}{\texttt {targetNamespace} \textit {attribute information item}}{29}{section*.3}
- \contentsline {subsection}{\numberline {2.1.3}Mapping Description's XML Representation to Component Properties}{29}{subsection.2.1.3}
- \contentsline {section}{\numberline {2.2}Interface}{30}{section.2.2}
- \contentsline {subsection}{\numberline {2.2.1}The Interface Component}{30}{subsection.2.2.1}
- \contentsline {subsection}{\numberline {2.2.2}XML Representation of Interface Component}{35}{subsection.2.2.2}
- \contentsline {subsubsection}{\texttt {name} \textit {attribute information item} with \texttt {interface} [owner element]}{36}{section*.4}
- \contentsline {subsubsection}{\texttt {extends} \textit {attribute information item}}{36}{section*.5}
- \contentsline {subsubsection}{\texttt {styleDefault} \textit {attribute information item}}{37}{section*.6}
- \contentsline {subsection}{\numberline {2.2.3}Mapping Interface's XML Representation to Component Properties}{37}{subsection.2.2.3}
- \contentsline {section}{\numberline {2.3}Interface Fault}{38}{section.2.3}
- \contentsline {subsection}{\numberline {2.3.1}The Interface Fault Component}{38}{subsection.2.3.1}
- \contentsline {subsection}{\numberline {2.3.2}XML Representation of Interface Fault Component}{40}{subsection.2.3.2}
- \contentsline {subsubsection}{\texttt {name} \textit {attribute information item} with \texttt {fault} [owner element]}{41}{section*.7}
- \contentsline {subsubsection}{\texttt {element} \textit {attribute information item} with \texttt {fault} [owner element]}{41}{section*.8}
- \contentsline {subsection}{\numberline {2.3.3}Mapping Interface Fault's XML Representation to Component Properties}{42}{subsection.2.3.3}
- \contentsline {section}{\numberline {2.4}Interface Operation}{42}{section.2.4}
- \contentsline {subsection}{\numberline {2.4.1}The Interface Operation Component}{42}{subsection.2.4.1}
- \contentsline {subsubsection}{Operation Style}{46}{section*.9}
- \contentsline {subsection}{\numberline {2.4.2}XML Representation of Interface Operation Component}{46}{subsection.2.4.2}
- \contentsline {subsubsection}{\texttt {name} \textit {attribute information item} with \texttt {operation} [owner element]}{48}{section*.10}
- \contentsline {subsubsection}{\texttt {pattern} \textit {attribute information item} with \texttt {operation} [owner element]}{48}{section*.11}
- \contentsline {subsubsection}{\texttt {style} \textit {attribute information item} with \texttt {operation} [owner element]}{49}{section*.12}
- \contentsline {subsubsection}{\texttt {safe} \textit {attribute information item} with \texttt {operation} [owner element]}{49}{section*.13}
- \contentsline {subsection}{\numberline {2.4.3}Mapping Interface Operation's XML Representation to Component Properties}{49}{subsection.2.4.3}
- \contentsline {section}{\numberline {2.5}Interface Message Reference}{50}{section.2.5}
- \contentsline {subsection}{\numberline {2.5.1}The Interface Message Reference Component}{50}{subsection.2.5.1}
- \contentsline {subsection}{\numberline {2.5.2}XML Representation of Interface Message Reference Component}{53}{subsection.2.5.2}
- \contentsline {subsubsection}{\texttt {messageLabel} \textit {attribute information item} with \texttt {input} or \texttt {output} [owner element]}{54}{section*.14}
- \contentsline {subsubsection}{\texttt {element} \textit {attribute information item} with \texttt {input} or \texttt {output} [owner element]}{54}{section*.15}
- \contentsline {subsection}{\numberline {2.5.3}Mapping Interface Message Reference's XML Representation to Component Properties}{55}{subsection.2.5.3}
- \contentsline {section}{\numberline {2.6}Interface Fault Reference}{56}{section.2.6}
- \contentsline {subsection}{\numberline {2.6.1}The Interface Fault Reference Component}{56}{subsection.2.6.1}
- \contentsline {subsection}{\numberline {2.6.2}XML Representation of Interface Fault Reference}{58}{subsection.2.6.2}
- \contentsline {subsubsection}{\texttt {ref} \textit {attribute information item} with \texttt {infault}, or \texttt {outfault} [owner element]}{60}{section*.16}
- \contentsline {subsubsection}{\texttt {messageLabel} \textit {attribute information item} with \texttt {infault}, or \texttt {outfault} [owner element]}{60}{section*.17}
- \contentsline {subsection}{\numberline {2.6.3}Mapping Interface Fault Reference's XML Representation to Component Properties}{60}{subsection.2.6.3}
- \contentsline {section}{\numberline {2.7}Feature}{61}{section.2.7}
- \contentsline {subsection}{\numberline {2.7.1}The Feature Component}{61}{subsection.2.7.1}
- \contentsline {subsubsection}{Feature Composition Model}{63}{section*.18}
- \contentsline {subsection}{\numberline {2.7.2}XML Representation of Feature Component}{65}{subsection.2.7.2}
- \contentsline {subsubsection}{\texttt {uri} \textit {attribute information item} with \texttt {feature} [owner element]}{66}{section*.19}
- \contentsline {subsubsection}{\texttt {required} \textit {attribute information item} with \texttt {feature} [owner element]}{66}{section*.20}
- \contentsline {subsection}{\numberline {2.7.3}Mapping Feature's XML Representation to Component Properties}{67}{subsection.2.7.3}
- \contentsline {section}{\numberline {2.8}Property}{67}{section.2.8}
- \contentsline {subsection}{\numberline {2.8.1}The Property Component}{67}{subsection.2.8.1}
- \contentsline {subsubsection}{Property Composition Model}{69}{section*.21}
- \contentsline {subsection}{\numberline {2.8.2}XML Representation of Property Component}{71}{subsection.2.8.2}
- \contentsline {subsubsection}{\texttt {uri} \textit {attribute information item} with \texttt {property} [owner element]}{72}{section*.22}
- \contentsline {subsubsection}{\texttt {value} \textit {element information item} with \texttt {property} [parent]}{72}{section*.23}
- \contentsline {subsubsection}{\texttt {constraint} \textit {element information item} with \texttt {property} [parent]}{73}{section*.24}
- \contentsline {subsection}{\numberline {2.8.3}Mapping Property's XML Representation to Component Properties}{73}{subsection.2.8.3}
- \contentsline {section}{\numberline {2.9}Binding}{74}{section.2.9}
- \contentsline {subsection}{\numberline {2.9.1}The Binding Component}{74}{subsection.2.9.1}
- \contentsline {subsection}{\numberline {2.9.2}XML Representation of Binding Component}{77}{subsection.2.9.2}
- \contentsline {subsubsection}{\texttt {name} \textit {attribute information item} with \texttt {binding} [owner element]}{78}{section*.25}
- \contentsline {subsubsection}{\texttt {interface} \textit {attribute information item} with \texttt {binding} [owner element]}{78}{section*.26}
- \contentsline {subsubsection}{\texttt {type} \textit {attribute information item} with \texttt {binding} [owner element]}{79}{section*.27}
- \contentsline {subsubsection}{Binding extension elements}{79}{section*.28}
- \contentsline {subsection}{\numberline {2.9.3}Mapping Binding's XML Representation to Component Properties}{79}{subsection.2.9.3}
- \contentsline {section}{\numberline {2.10}Binding Fault}{80}{section.2.10}
- \contentsline {subsection}{\numberline {2.10.1}The Binding Fault Component}{80}{subsection.2.10.1}
- \contentsline {subsection}{\numberline {2.10.2}XML Representation of Binding Fault Component}{82}{subsection.2.10.2}
- \contentsline {subsubsection}{\texttt {ref} \textit {attribute information item} with \texttt {fault} [owner element]}{83}{section*.29}
- \contentsline {subsubsection}{Binding Fault extension elements}{83}{section*.30}
- \contentsline {subsection}{\numberline {2.10.3}Mapping Binding Fault's XML Representation to Component Properties}{83}{subsection.2.10.3}
- \contentsline {section}{\numberline {2.11}Binding Operation}{84}{section.2.11}
- \contentsline {subsection}{\numberline {2.11.1}The Binding Operation Component}{84}{subsection.2.11.1}
- \contentsline {subsection}{\numberline {2.11.2}XML Representation of Binding Operation Component}{86}{subsection.2.11.2}
- \contentsline {subsubsection}{\texttt {ref} \textit {attribute information item} with \texttt {operation} [owner element]}{88}{section*.31}
- \contentsline {subsubsection}{Binding Operation extension elements}{88}{section*.32}
- \contentsline {subsection}{\numberline {2.11.3}Mapping Binding Operation's XML Representation to Component Properties}{88}{subsection.2.11.3}
- \contentsline {section}{\numberline {2.12}Binding Message Reference}{89}{section.2.12}
- \contentsline {subsection}{\numberline {2.12.1}The Binding Message Reference Component}{89}{subsection.2.12.1}
- \contentsline {subsection}{\numberline {2.12.2}XML Representation of Binding Message Reference Component}{91}{subsection.2.12.2}
- \contentsline {subsubsection}{\texttt {messageLabel} \textit {attribute information item} with \texttt {input} or \texttt {output} [owner element]}{92}{section*.33}
- \contentsline {subsubsection}{Binding Message Reference extension elements}{92}{section*.34}
- \contentsline {subsection}{\numberline {2.12.3}Mapping Binding Message Reference's XML Representation to Component Properties}{92}{subsection.2.12.3}
- \contentsline {section}{\numberline {2.13}Binding Fault Reference}{93}{section.2.13}
- \contentsline {subsection}{\numberline {2.13.1}The Binding Fault Reference Component}{93}{subsection.2.13.1}
- \contentsline {subsection}{\numberline {2.13.2}XML Representation of Binding Fault Reference Component}{95}{subsection.2.13.2}
- \contentsline {subsubsection}{\texttt {ref} \textit {attribute information item} with \texttt {infault} or \texttt {outfault} [owner element]}{96}{section*.35}
- \contentsline {subsubsection}{\texttt {messageLabel} \textit {attribute information item} with \texttt {infault} or \texttt {outfault} [owner element]}{97}{section*.36}
- \contentsline {subsubsection}{Binding Fault Reference extension elements}{97}{section*.37}
- \contentsline {subsection}{\numberline {2.13.3}Mapping Binding Fault Reference's XML Representation to Component Properties}{97}{subsection.2.13.3}
- \contentsline {section}{\numberline {2.14}Service}{98}{section.2.14}
- \contentsline {subsection}{\numberline {2.14.1}The Service Component}{98}{subsection.2.14.1}
- \contentsline {subsubsection}{Operation Name Mapping (non-normative)}{100}{section*.38}
- \contentsline {subsection}{\numberline {2.14.2}XML Representation of Service Component}{101}{subsection.2.14.2}
- \contentsline {subsubsection}{Service References}{102}{section*.39}
- \contentsline {subsubsection}{\texttt {name} \textit {attribute information item} with \texttt {service} [owner element]}{102}{section*.40}
- \contentsline {subsubsection}{\texttt {interface} \textit {attribute information item} with \texttt {service} [owner element]}{103}{section*.41}
- \contentsline {subsection}{\numberline {2.14.3}Mapping Service's XML Representation to Component Properties}{103}{subsection.2.14.3}
- \contentsline {section}{\numberline {2.15}Endpoint}{104}{section.2.15}
- \contentsline {subsection}{\numberline {2.15.1}The Endpoint Component}{104}{subsection.2.15.1}
- \contentsline {subsection}{\numberline {2.15.2}XML Representation of Endpoint Component}{106}{subsection.2.15.2}
- \contentsline {subsubsection}{Endpoint References}{107}{section*.42}
- \contentsline {subsubsection}{\texttt {name} \textit {attribute information item} with \texttt {endpoint} [owner element]}{107}{section*.43}
- \contentsline {subsubsection}{\texttt {binding} \textit {attribute information item} with \texttt {endpoint} [owner element]}{107}{section*.44}
- \contentsline {subsubsection}{\texttt {address} \textit {attribute information item} with \texttt {endpoint} [owner element]}{108}{section*.45}
- \contentsline {subsubsection}{Endpoint extension elements}{108}{section*.46}
- \contentsline {subsection}{\numberline {2.15.3}Mapping Endpoint's XML Representation to Component Properties}{108}{subsection.2.15.3}
- \contentsline {section}{\numberline {2.16}XML Schema 1.0 Simple Types Used in the Component Model}{109}{section.2.16}
- \contentsline {section}{\numberline {2.17}Equivalence of Components}{110}{section.2.17}
- \contentsline {section}{\numberline {2.18}Symbol Spaces}{110}{section.2.18}
- \contentsline {section}{\numberline {2.19}QName resolution}{111}{section.2.19}
- \contentsline {section}{\numberline {2.20}Comparing URIs}{111}{section.2.20}
- \contentsline {chapter}{\numberline {3}Types}{112}{chapter.3}
- \contentsline {section}{\numberline {3.1}Using W3C XML Schema Description Language}{113}{section.3.1}
- \contentsline {subsection}{\numberline {3.1.1}Importing XML Schema}{114}{subsection.3.1.1}
- \contentsline {subsubsection}{\texttt {namespace} \textit {attribute information item}}{114}{section*.47}
- \contentsline {subsubsection}{ \texttt {schemaLocation} \textit {attribute information item} }{115}{section*.48}
- \contentsline {subsection}{\numberline {3.1.2}Inlining XML Schema}{115}{subsection.3.1.2}
- \contentsline {subsubsection}{\texttt {targetNamespace} \textit {attribute information item}}{116}{section*.49}
- \contentsline {subsection}{\numberline {3.1.3}References to Element Declarations and Type Definitions}{117}{subsection.3.1.3}
- \contentsline {section}{\numberline {3.2}Using Other Schema Languages}{117}{section.3.2}
- \contentsline {chapter}{\numberline {4}Modularizing WSDL 2.0 descriptions}{119}{chapter.4}
- \contentsline {section}{\numberline {4.1}Including Descriptions}{119}{section.4.1}
- \contentsline {subsection}{\numberline {4.1.1}\texttt {location} \textit {attribute information item} with \texttt {include} [owner element]}{120}{subsection.4.1.1}
- \contentsline {section}{\numberline {4.2}Importing Descriptions}{121}{section.4.2}
- \contentsline {subsection}{\numberline {4.2.1}\texttt {namespace} \textit {attribute information item}}{122}{subsection.4.2.1}
- \contentsline {subsection}{\numberline {4.2.2}\texttt {location} \textit {attribute information item} with \texttt {import} [owner element]}{123}{subsection.4.2.2}
- \contentsline {chapter}{\numberline {5}Documentation}{124}{chapter.5}
- \contentsline {chapter}{\numberline {6}Language Extensibility}{125}{chapter.6}
- \contentsline {section}{\numberline {6.1}Element based Extensibility}{125}{section.6.1}
- \contentsline {subsection}{\numberline {6.1.1}Mandatory extensions}{126}{subsection.6.1.1}
- \contentsline {subsection}{\numberline {6.1.2}\texttt {required} \textit {attribute information item}}{127}{subsection.6.1.2}
- \contentsline {section}{\numberline {6.2}Attribute-based Extensibility}{127}{section.6.2}
- \contentsline {section}{\numberline {6.3}Extensibility Semantics}{127}{section.6.3}
- \contentsline {chapter}{\numberline {7}Locating WSDL 2.0 Documents}{129}{chapter.7}
- \contentsline {section}{\numberline {7.1}\texttt {wsdli:wsdlLocation} \textit {attribute information item}}{129}{section.7.1}
- \contentsline {chapter}{\numberline {8}Conformance}{131}{chapter.8}
- \contentsline {section}{\numberline {8.1}XML Information Set Conformance}{131}{section.8.1}
- \contentsline {chapter}{\numberline {9}XML Syntax Summary (Non-Normative)}{132}{chapter.9}
- \contentsline {chapter}{\numberline {10}References}{136}{chapter.10}
- \contentsline {section}{\numberline {10.1}Normative References}{136}{section.10.1}
- \contentsline {section}{\numberline {10.2}Informative References}{138}{section.10.2}
- \contentsline {chapter}{\numberline {A}The application/wsdl+xml Media Type}{141}{appendix.A}
- \contentsline {section}{\numberline {A.1}Registration}{141}{section.A.1}
- \contentsline {section}{\numberline {A.2}Fragment Identifiers}{142}{section.A.2}
- \contentsline {subsection}{\numberline {A.2.1}wsdl.interface(\textit {interface})}{144}{subsection.A.2.1}
- \contentsline {subsection}{\numberline {A.2.2}wsdl.interfaceFault(\textit {interface}/\textit {fault})}{144}{subsection.A.2.2}
- \contentsline {subsection}{\numberline {A.2.3}wsdl.interfaceOperation(\textit {interface}/\textit {operation})}{144}{subsection.A.2.3}
- \contentsline {subsection}{\numberline {A.2.4}wsdl.interfaceMessageReference(\textit {interface}/\textit {operation}/\textit {message})}{144}{subsection.A.2.4}
- \contentsline {subsection}{\numberline {A.2.5}wsdl.interfaceFaultReference(\textit {interface}/\textit {operation}/\textit {message}/\textit {fault})}{144}{subsection.A.2.5}
- \contentsline {subsection}{\numberline {A.2.6}wsdl.binding(\textit {binding})}{145}{subsection.A.2.6}
- \contentsline {subsection}{\numberline {A.2.7}wsdl.bindingFault(\textit {binding}/\textit {fault})}{145}{subsection.A.2.7}
- \contentsline {subsection}{\numberline {A.2.8}wsdl.bindingOperation(\textit {binding}/\textit {operation})}{145}{subsection.A.2.8}
- \contentsline {subsection}{\numberline {A.2.9}wsdl.bindingMessageReference(\textit {binding}/\textit {operation}/\textit {message})}{145}{subsection.A.2.9}
- \contentsline {subsection}{\numberline {A.2.10}wsdl.bindingFaultReference(\textit {binding}/\textit {operation}/\textit {fault}/\textit {message})}{145}{subsection.A.2.10}
- \contentsline {subsection}{\numberline {A.2.11} wsdl.service(\textit {service}) }{146}{subsection.A.2.11}
- \contentsline {subsection}{\numberline {A.2.12}wsdl.endpoint(\textit {service}/\textit {endpoint})}{146}{subsection.A.2.12}
- \contentsline {subsection}{\numberline {A.2.13}wsdl.feature(\textit {parent}/\textit {feature})}{146}{subsection.A.2.13}
- \contentsline {subsection}{\numberline {A.2.14}wsdl.property(\textit {parent}/\textit {property})}{146}{subsection.A.2.14}
- \contentsline {subsection}{\numberline {A.2.15}wsdl.extension(\textit {extension-namespace}, \textit {extension-specific-syntax})}{146}{subsection.A.2.15}
- \contentsline {section}{\numberline {A.3}Security considerations}{147}{section.A.3}
- \contentsline {chapter}{\numberline {B}Acknowledgements (Non-Normative)}{148}{appendix.B}
- \contentsline {chapter}{\numberline {C}URI References for WSDL 2.0 Components (Non-Normative)}{150}{appendix.C}
- \contentsline {section}{\numberline {C.1}WSDL 2.0 URIs}{150}{section.C.1}
- \contentsline {section}{\numberline {C.2}Example}{151}{section.C.2}
- \contentsline {chapter}{\numberline {D}Migrating from WSDL 1.1 to WSDL 2.0 (Non-Normative)}{152}{appendix.D}
- \contentsline {section}{\numberline {D.1}Operation Overloading}{152}{section.D.1}
- \contentsline {section}{\numberline {D.2}PortTypes}{152}{section.D.2}
- \contentsline {section}{\numberline {D.3}Ports}{152}{section.D.3}
- \contentsline {section}{\numberline {D.4}Single Interface per Service}{152}{section.D.4}
- \contentsline {chapter}{\numberline {E}Examples of Specifications of Extension Elements for Alternative Schema Language Support. (Non-Normative)}{154}{appendix.E}
- \contentsline {section}{\numberline {E.1}DTD}{154}{section.E.1}
- \contentsline {subsection}{\numberline {E.1.1}\texttt {namespace} \textit {attribute information item}}{155}{subsection.E.1.1}
- \contentsline {subsection}{\numberline {E.1.2}\texttt {location} \textit {attribute information item}}{155}{subsection.E.1.2}
- \contentsline {subsection}{\numberline {E.1.3}References to Element Definitions}{155}{subsection.E.1.3}
- \contentsline {section}{\numberline {E.2}RELAX NG}{155}{section.E.2}
- \contentsline {subsection}{\numberline {E.2.1}Importing RELAX NG}{156}{subsection.E.2.1}
- \contentsline {subsubsection}{\texttt {ns} \textit {attribute information item}}{156}{section*.50}
- \contentsline {subsubsection}{\texttt {href} \textit {attribute information item}}{156}{section*.51}
- \contentsline {subsection}{\numberline {E.2.2}Inlining RELAX NG}{157}{subsection.E.2.2}
- \contentsline {subsubsection}{\texttt {ns} \textit {attribute information item}}{157}{section*.52}
- \contentsline {subsection}{\numberline {E.2.3}References to Element Declarations}{157}{subsection.E.2.3}
- \contentsline {chapter}{\numberline {F}Part 1 Change Log (Non-Normative)}{158}{appendix.F}
- \contentsline {section}{\numberline {F.1}WSDL 2.0 Specification Changes}{158}{section.F.1}
--- 0 ----

Index: wsdl20.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20.xml,v
retrieving revision 1.270
retrieving revision 1.271
diff -C2 -d -r1.270 -r1.271
*** wsdl20.xml	23 May 2005 21:17:33 -0000	1.270
--- wsdl20.xml	25 May 2005 21:30:50 -0000	1.271
***************
*** 487,490 ****
--- 487,541 ----
    </p>
    
+   <z:notation name="ComponentModel">
+ 
+   <p>
+   	A WSDL 2.0 document, and its related documents, defines a set of
+   	components that together form an instance of a Component Model.
+   	This specification defines the structure and constraints on the
+   	components in a valid component model instance.
+   </p>
+ 
+   <p>
+   	Let
+   	<z:i>ComponentModel</z:i>
+   	be the set of valid component model instances:
+   </p>
+ 
+   <schema xmlns="http://www.w3.org/2004/zml" name="ComponentModel">
+   		DescriptionCM <nl/>
+   		ElementDeclarationCM <nl/>
+   		TypeDefinitionCM <nl/>
+   		FeatureCM <nl/>
+   		PropertyCM <nl/>
+   		InterfaceCM <nl/>
+   		InterfaceFaultCM <nl/>
+   		InterfaceOperationCM <nl/>
+   		InterfaceMessageReferenceCM <nl/>
+   		InterfaceFaultReferenceCM <nl/>
+   		BindingCM <nl/>
+   		BindingFaultCM <nl/>
+   		BindingOperationCM <nl/>
+   		BindingMessageReferenceCM <nl/>
+   		BindingFaultReferenceCM <nl/>
+   		ServiceCM <nl/>
+   		EndpointCM
+   </schema>
+   
+   <z:see names="DescriptionCM ElementDeclarationCM TypeDefinitionCM FeatureCM PropertyCM 
+   	InterfaceCM InterfaceFaultCM  InterfaceOperationCM InterfaceMessageReferenceCM InterfaceFaultReferenceCM
+   	BindingCM BindingFaultCM BindingOperationCM BindingMessageReferenceCM BindingFaultReferenceCM 
+ 	ServiceCM EndpointCM"/>
+ 
+   <p>
+   	The definition of
+   	<z:i>ComponentModel</z:i>
+   	is built up from definitions for each of the component
+   	types. A component model instance is valid if and only if the
+   	constraints on each of the component types are satisfied. The
+   	component type definitions are given in the following sections.
+   </p>
+ 
+   </z:notation>
+   
    <p>
    Components are typed collections of properties that correspond to  
***************
*** 1001,1007 ****
    
    <p>
!   Let <z:i>ComponentModel2</z:i> be the basic component model,
!   augmented with the definitions of the subsets of each component type
!   and their corresponding identifiers:
    </p>
  
--- 1052,1060 ----
    
    <p>
!   	Let
!   	<z:i>ComponentModel2</z:i>
!   	be the basic component model, augmented with the definitions of
!   	the subsets of each component type and their corresponding
!   	identifiers:
    </p>
  
***************
*** 1332,1336 ****
        </z:notation>
        
!        <z:notation name="ElementDeclarationKey">
  
         		<p>
--- 1385,1389 ----
        </z:notation>
        
!        <z:notation name="ElementDeclarationCM">
  
         		<p>
***************
*** 1341,1349 ****
         		
         		<p>
! 			       Let <z:i>ElementDeclarationKey</z:i> express this
  			       constraint:
  			</p>
  			
! 			<schema xmlns="http://www.w3.org/2004/zml" name="ElementDeclarationKey">
  				ComponentModel2
  			<where/>
--- 1394,1402 ----
         		
         		<p>
! 			       Let <z:i>ElementDeclarationCM</z:i> express this
  			       constraint:
  			</p>
  			
! 			<schema xmlns="http://www.w3.org/2004/zml" name="ElementDeclarationCM">
  				ComponentModel2
  			<where/>
***************
*** 1380,1384 ****
        </z:notation>
        
!        <z:notation name="TypeDefinitionKey">
  
         		<p>
--- 1433,1437 ----
        </z:notation>
        
!        <z:notation name="TypeDefinitionCM">
  
         		<p>
***************
*** 1389,1397 ****
         		
         		<p>
! 			       Let <z:i>TypeDefinitionKey</z:i> express this
  			       constraint:
  			</p>
  			
! 			<schema xmlns="http://www.w3.org/2004/zml" name="TypeDefinitionKey">
  				ComponentModel2
  			<where/>
--- 1442,1450 ----
         		
         		<p>
! 			       Let <z:i>TypeDefinitionCM</z:i> express this
  			       constraint:
  			</p>
  			
! 			<schema xmlns="http://www.w3.org/2004/zml" name="TypeDefinitionCM">
  				ComponentModel2
  			<where/>
***************
*** 1474,1478 ****
  </z:notation>
  
! <z:notation name="DescriptionRI">
  <p>
  Each component refered to by the properties of the Description component
--- 1527,1531 ----
  </z:notation>
  
! <z:notation name="DescriptionCM">
  <p>
  Each component refered to by the properties of the Description component
***************
*** 1480,1489 ****
  </p>
  <p>
! Let <z:i>DescriptionRI</z:i> express these referential integrity constraints
  on the Description component:
  </p>
  
! <schema xmlns="http://www.w3.org/2004/zml" name="DescriptionRI">
! 	DescriptionKey <nl/>
  <where/>
  	descriptionComp.interfaces = interfaceIds <nl/>
--- 1533,1542 ----
  </p>
  <p>
! Let <z:i>DescriptionCM</z:i> express these referential integrity constraints
  on the Description component:
  </p>
  
! <schema xmlns="http://www.w3.org/2004/zml" name="DescriptionCM">
! 	DescriptionKey
  <where/>
  	descriptionComp.interfaces = interfaceIds <nl/>
***************
*** 2130,2133 ****
--- 2183,2211 ----
  	  </z:notation>
  	  
+ 	  <z:notation name="InterfaceCM">
+ 	  
+ 	  	<p>
+ 	  		Let
+ 	  		<z:i>InterfaceCM</z:i>
+ 	  		be the conjunction of all the component model constraints
+ 	  		on Interface components.
+ 	  	</p>
+ 
+ 	  	<zed xmlns="http://www.w3.org/2004/zml">
+ 			InterfaceCM <defs/> <nl/>
+ 			<t1/>	InterfaceRI <land/> <nl/>
+ 			<t1/>	InterfaceKey <land/> <nl/>
+ 			<t1/>	InterfaceParent <land/> <nl/>
+ 			<t1/>	InterfaceAllExtendedInterfaces <land/> <nl/>
+ 			<t1/>	InterfaceExtendsAcyclic <land/> <nl/>
+ 			<t1/>	InterfaceAllInterfaceOperations <land/> <nl/>
+ 			<t1/>	InterfaceAllInterfaceFaults
+ 	  	</zed>
+ 	  	
+ 	  	<z:see names="InterfaceRI InterfaceKey InterfaceParent InterfaceAllExtendedInterfaces
+ 	  		InterfaceExtendsAcyclic InterfaceAllInterfaceOperations InterfaceAllInterfaceFaults"/>
+ 	  		
+ 	  </z:notation>
+ 
      </div3>
  
***************
*** 2609,2612 ****
--- 2687,2710 ----
          such message types with the message reference.</p>
  
+ 	  <z:notation name="InterfaceFaultCM">
+ 	  
+ 	  	<p>
+ 	  		Let
+ 	  		<z:i>InterfaceFaultCM</z:i>
+ 	  		be the conjunction of all the component model constraints
+ 	  		on Interface Fault components.
+ 	  	</p>
+ 
+ 	  	<zed xmlns="http://www.w3.org/2004/zml">
+ 			InterfaceFaultCM <defs/> <nl/>
+ 			<t1/>	InterfaceFaultRI <land/> <nl/>
+ 			<t1/>	InterfaceFaultKey <land/> <nl/>
+ 			<t1/>	InterfaceFaultNameUnique
+ 	  	</zed>
+ 	  	
+ 	  	<z:see names="InterfaceFaultRI InterfaceFaultKey InterfaceFaultNameUnique"/>
+ 	  		
+ 	  </z:notation>
+ 
      </div3>
  
***************
*** 2875,2898 ****
  	  </ulist>
  
! <z:notation name="InterfaceOperation">	
! <p>
! Let <z:i>InterfaceOperation</z:i> be the set of all 
! Interface Operation components:
! </p>
! 
! <schema xmlns="http://www.w3.org/2004/zml" name="InterfaceOperation">
! 	NestedBase <nl/>
! 	name : QName <nl/>
! 	messageExchangePattern : AbsoluteURI <nl/>
! 	interfaceMessageReferences : <power/> ID <nl/>
! 	interfaceFaultReferences : <power/> ID <nl/>
! 	style : <power/> AbsoluteURI <nl/>
! 	safety : Boolean
! </schema>
! 
! <z:see names="NestedBase QName AbsoluteURI ID Boolean"/>
! 
! </z:notation>
! 
  	  <z:notation name="InterfaceOperationRI">
  	  
--- 2973,2996 ----
  	  </ulist>
  
! 		<z:notation name="InterfaceOperation">	
! 		<p>
! 		Let <z:i>InterfaceOperation</z:i> be the set of all 
! 		Interface Operation components:
! 		</p>
! 		
! 		<schema xmlns="http://www.w3.org/2004/zml" name="InterfaceOperation">
! 			NestedBase <nl/>
! 			name : QName <nl/>
! 			messageExchangePattern : AbsoluteURI <nl/>
! 			interfaceMessageReferences : <power/> ID <nl/>
! 			interfaceFaultReferences : <power/> ID <nl/>
! 			style : <power/> AbsoluteURI <nl/>
! 			safety : Boolean
! 		</schema>
! 		
! 		<z:see names="NestedBase QName AbsoluteURI ID Boolean"/>
! 		
! 		</z:notation>
! 		
  	  <z:notation name="InterfaceOperationRI">
  	  
***************
*** 3070,3073 ****
--- 3168,3192 ----
  	  </z:notation>
  
+  	  <z:notation name="InterfaceOperationCM">
+ 	  
+ 	  	<p>
+ 	  		Let
+ 	  		<z:i>InterfaceOperationCM</z:i>
+ 	  		be the conjunction of all the component model constraints
+ 	  		on Interface Operation components.
+ 	  	</p>
+ 
+ 	  	<zed xmlns="http://www.w3.org/2004/zml">
+ 			InterfaceOperationCM <defs/> <nl/>
+ 			<t1/>	InterfaceOperationRI <land/> <nl/>
+ 			<t1/>	InterfaceOperationKey <land/> <nl/>
+ 			<t1/>	InterfaceOperationParent <land/> <nl/>
+ 			<t1/>	InterfaceOperationNameUnique
+ 	  	</zed>
+ 	  	
+ 	  	<z:see names="InterfaceOperationRI InterfaceOperationKey InterfaceOperationParent InterfaceOperationNameUnique"/>
+ 	  		
+ 	  </z:notation>
+ 
        <div4 id="InterfaceOperationStyle">
          <head>Operation Style</head>
***************
*** 3597,3600 ****
--- 3716,3738 ----
          reference.</p>
  
+  	  <z:notation name="InterfaceMessageReferenceCM">
+ 	  
+ 	  	<p>
+ 	  		Let
+ 	  		<z:i>InterfaceMessageReferenceCM</z:i>
+ 	  		be the conjunction of all the component model constraints
+ 	  		on Interface Message Reference components.
+ 	  	</p>
+ 
+ 	  	<zed xmlns="http://www.w3.org/2004/zml">
+ 			InterfaceMessageReferenceCM <defs/> <nl/>
+ 			<t1/>	InterfaceMessageReferenceRI <land/> <nl/>
+ 			<t1/>	InterfaceMessageReferenceKey
+ 	  	</zed>
+ 	  	
+ 	  	<z:see names="InterfaceMessageReferenceRI InterfaceMessageReferenceKey"/>
+ 	  		
+ 	  </z:notation>
+ 
      </div3>
  
***************
*** 4022,4025 ****
--- 4160,4183 ----
  	  </z:notation>
  	  
+  	  <z:notation name="InterfaceFaultReferenceCM">
+ 	  
+ 	  	<p>
+ 	  		Let
+ 	  		<z:i>InterfaceFaultReferenceCM</z:i>
+ 	  		be the conjunction of all the component model constraints
+ 	  		on Interface Fault Reference components.
+ 	  	</p>
+ 
+ 	  	<zed xmlns="http://www.w3.org/2004/zml">
+ 			InterfaceFaultReferenceCM <defs/> <nl/>
+ 			<t1/>	InterfaceFaultReferenceRI <land/> <nl/>
+ 			<t1/>	InterfaceFaultReferenceKey <land/> <nl/>
+ 			<t1/>	InterfaceFaultReferenceConsistent
+ 	  	</zed>
+ 	  	
+ 	  	<z:see names="InterfaceFaultReferenceRI InterfaceFaultReferenceKey InterfaceFaultReferenceConsistent"/>
+ 	  		
+ 	  </z:notation>
+ 
      </div3>
  
***************
*** 4367,4370 ****
--- 4525,4547 ----
         </z:notation>
  
+  	  <z:notation name="FeatureCM">
+ 	  
+ 	  	<p>
+ 	  		Let
+ 	  		<z:i>FeatureCM</z:i>
+ 	  		be the conjunction of all the component model constraints
+ 	  		on Feature components.
+ 	  	</p>
+ 
+ 	  	<zed xmlns="http://www.w3.org/2004/zml">
+ 			FeatureCM <defs/> <nl/>
+ 			<t1/>	FeatureRI <land/> <nl/>
+ 			<t1/>	FeatureKey
+ 	  	</zed>
+ 	  	
+ 	  	<z:see names="FeatureRI FeatureKey"/>
+ 	  	
+ 	  </z:notation>
+ 	  		
  	  <div4 id="Feature_composition_model">
  	    <head>Feature Composition Model</head>
***************
*** 4917,4920 ****
--- 5094,5116 ----
          for properties.</p>
  
+  	  <z:notation name="PropertyCM">
+ 	  
+ 	  	<p>
+ 	  		Let
+ 	  		<z:i>PropertyCM</z:i>
+ 	  		be the conjunction of all the component model constraints
+ 	  		on Property components.
+ 	  	</p>
+ 
+ 	  	<zed xmlns="http://www.w3.org/2004/zml">
+ 			PropertyCM <defs/> <nl/>
+ 			<t1/>	PropertyRI <land/> <nl/>
+ 			<t1/>	PropertyKey
+ 	  	</zed>
+ 	  	
+ 	  	<z:see names="PropertyRI PropertyKey"/>
+ 
+ 	  </z:notation>
+ 	  		
  	  <div4 id="Property_composition_model">
  	    <head>Property Composition Model</head>
***************
*** 5536,5539 ****
--- 5732,5755 ----
  	  </z:notation>
  	  
+  	  <z:notation name="BindingCM">
+ 	  
+ 	  	<p>
+ 	  		Let
+ 	  		<z:i>BindingCM</z:i>
+ 	  		be the conjunction of all the component model constraints
+ 	  		on Binding components.
+ 	  	</p>
+ 
+ 	  	<zed xmlns="http://www.w3.org/2004/zml">
+ 			BindingCM <defs/> <nl/>
+ 			<t1/>	BindingRI <land/> <nl/>
+ 			<t1/>	BindingKey <land/> <nl/>
+ 			<t1/>	BindingParent
+ 	  	</zed>
+ 	  	
+ 	  	<z:see names="BindingRI BindingKey BindingParent"/>
+ 
+ 	  </z:notation>
+ 	  		
      </div3>
  
***************
*** 5930,5933 ****
--- 6146,6169 ----
  	  </z:notation>
  
+  	  <z:notation name="BindingFaultCM">
+ 	  
+ 	  	<p>
+ 	  		Let
+ 	  		<z:i>BindingFaultCM</z:i>
+ 	  		be the conjunction of all the component model constraints
+ 	  		on Binding Fault components.
+ 	  	</p>
+ 
+ 	  	<zed xmlns="http://www.w3.org/2004/zml">
+ 			BindingFaultCM <defs/> <nl/>
+ 			<t1/>	BindingFaultRI <land/> <nl/>
+ 			<t1/>	BindingFaultKey <land/> <nl/>
+ 			<t1/>	BindingFaultConsistent
+ 	  	</zed>
+ 	  	
+ 	  	<z:see names="BindingFaultRI BindingFaultKey BindingFaultConsistent"/>
+ 
+ 	  </z:notation>
+ 	  		
      </div3>
  
***************
*** 6079,6082 ****
--- 6315,6319 ----
  
      </div3>
+     
    </div2>
  
***************
*** 6295,6298 ****
--- 6532,6556 ----
  	  </z:notation>
  
+  	  <z:notation name="BindingOperationCM">
+ 	  
+ 	  	<p>
+ 	  		Let
+ 	  		<z:i>BindingOperationCM</z:i>
+ 	  		be the conjunction of all the component model constraints
+ 	  		on Binding Operation components.
+ 	  	</p>
+ 
+ 	  	<zed xmlns="http://www.w3.org/2004/zml">
+ 			BindingOperationCM <defs/> <nl/>
+ 			<t1/>	BindingOperationRI <land/> <nl/>
+ 			<t1/>	BindingOperationKey <land/> <nl/>
+ 			<t1/>	BindingOperationParent <land/> <nl/>
+ 			<t1/>	BindingOperationConsistent
+ 	  	</zed>
+ 	  	
+ 	  	<z:see names="BindingOperationRI BindingOperationKey BindingOperationParent BindingOperationConsistent"/>
+ 
+ 	  </z:notation>
+ 	  		
      </div3>
  
***************
*** 6369,6374 ****
  			    		Zero or more
  			    		<el>feature</el>
! 			    		&EII;
! 			    		s (see
  			    		<specref ref="Feature_XMLRep" />)
  			    	</p>
--- 6627,6631 ----
  			    		Zero or more
  			    		<el>feature</el>
! 			    		&EII;s (see
  			    		<specref ref="Feature_XMLRep" />)
  			    	</p>
***************
*** 6379,6384 ****
  			    		Zero or more
  			    		<el>property</el>
! 			    		&EII;
! 			    		s (see
  			    		<specref ref="Feature_XMLRep" />)
  			    	</p>
--- 6636,6640 ----
  			    		Zero or more
  			    		<el>property</el>
! 			    		&EII;s (see
  			    		<specref ref="Feature_XMLRep" />)
  			    	</p>
***************
*** 6521,6525 ****
  	  <schema xmlns="http://www.w3.org/2004/zml" name="BindingMessageReference">
  			NestedBase <nl/>
! 	  		interfaceMessageReference: ID
  	  </schema>
  	  
--- 6777,6781 ----
  	  <schema xmlns="http://www.w3.org/2004/zml" name="BindingMessageReference">
  			NestedBase <nl/>
! 	  		interfaceMessageReference : ID
  	  </schema>
  	  
***************
*** 6634,6637 ****
--- 6890,6913 ----
      </z:notation>
  
+  	  <z:notation name="BindingMessageReferenceCM">
+ 	  
+ 	  	<p>
+ 	  		Let
+ 	  		<z:i>BindingMessageReferenceCM</z:i>
+ 	  		be the conjunction of all the component model constraints
+ 	  		on Binding Message Reference components.
+ 	  	</p>
+ 
+ 	  	<zed xmlns="http://www.w3.org/2004/zml">
+ 			BindingMessageReferenceCM <defs/> <nl/>
+ 			<t1/>	BindingMessageReferenceRI <land/> <nl/>
+ 			<t1/>	BindingMessageReferenceKey <land/> <nl/>
+ 			<t1/>	BindingMessageReferenceConsistent
+ 	  	</zed>
+ 	  	
+ 	  	<z:see names="BindingMessageReferenceRI BindingMessageReferenceKey BindingMessageReferenceConsistent"/>
+ 
+ 	  </z:notation>
+ 	  		
      </div3>
      
***************
*** 6963,6966 ****
--- 7239,7262 ----
      </z:notation>
  
+  	  <z:notation name="BindingFaultReferenceCM">
+ 	  
+ 	  	<p>
+ 	  		Let
+ 	  		<z:i>BindingFaultReferenceCM</z:i>
+ 	  		be the conjunction of all the component model constraints
+ 	  		on Binding Fault Reference components.
+ 	  	</p>
+ 
+ 	  	<zed xmlns="http://www.w3.org/2004/zml">
+ 			BindingFaultReferenceCM <defs/> <nl/>
+ 			<t1/>	BindingFaultReferenceRI <land/> <nl/>
+ 			<t1/>	BindingFaultReferenceKey <land/> <nl/>
+ 			<t1/>	BindingFaultReferenceConsistent
+ 	  	</zed>
+ 	  	
+ 	  	<z:see names="BindingFaultReferenceRI BindingFaultReferenceKey BindingFaultReferenceConsistent"/>
+ 
+ 	  </z:notation>
+ 	  		
      </div3>
  
***************
*** 7291,7294 ****
--- 7587,7610 ----
  	  </z:notation>
  	  
+  	  <z:notation name="ServiceCM">
+ 	  
+ 	  	<p>
+ 	  		Let
+ 	  		<z:i>ServiceCM</z:i>
+ 	  		be the conjunction of all the component model constraints
+ 	  		on Service components.
+ 	  	</p>
+ 
+ 	  	<zed xmlns="http://www.w3.org/2004/zml">
+ 			ServiceCM <defs/> <nl/>
+ 			<t1/>	ServiceRI <land/> <nl/>
+ 			<t1/>	ServiceKey <land/> <nl/>
+ 			<t1/>	ServiceParent
+ 	  	</zed>
+ 	  	
+ 	  	<z:see names="ServiceRI ServiceKey ServiceParent"/>
+ 
+ 	  </z:notation>
+ 	  		
          <div4 id="Service_OperationName">
            <head>Operation Name Mapping (non-normative)</head>
***************
*** 7732,7735 ****
--- 8048,8071 ----
  	  </z:notation>
  	  
+  	  <z:notation name="EndpointCM">
+ 	  
+ 	  	<p>
+ 	  		Let
+ 	  		<z:i>EndpointCM</z:i>
+ 	  		be the conjunction of all the component model constraints
+ 	  		on Endpoint components.
+ 	  	</p>
+ 
+ 	  	<zed xmlns="http://www.w3.org/2004/zml">
+ 			EndpointCM <defs/> <nl/>
+ 			<t1/>	EndpointRI <land/> <nl/>
+ 			<t1/>	EndpointKey <land/> <nl/>
+ 			<t1/>	EndpointConsistent
+ 	  	</zed>
+ 	  	
+ 	  	<z:see names="EndpointRI EndpointKey EndpointConsistent"/>
+ 
+ 	  </z:notation>
+ 	  		
      </div3>
  
***************
*** 10667,10670 ****
--- 11003,11012 ----
      
      <tr>
+     	<td>20050525</td>
+     	<td>AGR</td>
+     	<td>Added final ComponentModel to Z Notation.</td>
+     </tr>
+ 
+     <tr>
      	<td>20050523</td>
      	<td>AGR</td>

Index: wsdl20-z.html
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20-z.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** wsdl20-z.html	23 May 2005 00:53:21 -0000	1.31
--- wsdl20-z.html	25 May 2005 21:30:51 -0000	1.32
***************
*** 493,496 ****
--- 493,526 ----
    </p>
    
+   <a name="zed-ComponentModel"></a><div id="twisty-head-zed-ComponentModel" class="twisty-head"><img src="images/left-twisty-13.png" alt="" class="twisty-icon"><a onclick="show('zed-ComponentModel')">ComponentModel</a>...</div><div id="twisty-body-zed-ComponentModel" class="twisty-body"><img src="images/down-twisty-13.png" alt="" class="twisty-icon"><a onclick="hide('zed-ComponentModel')">ComponentModel</a>&nbsp;&nbsp;[&nbsp;<a onClick="showAll()" href="#zed-ComponentModel">show all</a>&nbsp;]&nbsp;&nbsp;[&nbsp;<a onClick="hideAll()" href="#zed-ComponentModel">hide all</a>&nbsp;]<br>
+ 
+   <p>
+   	A WSDL 2.0 document, and its related documents, defines a set of
+   	components that together form an instance of a Component Model.
+   	This specification defines the structure and constraints on the
+   	components in a valid component model instance.
[...2275 lines suppressed...]
  
***************
*** 9869,9872 ****
--- 10227,10242 ----
      
      <tr>
+     	<td rowspan="1" colspan="1">20050525</td>
+     	<td rowspan="1" colspan="1">AGR</td>
+     	<td rowspan="1" colspan="1">Added final ComponentModel to Z Notation.</td>
+     </tr>
+ 
+     <tr>
+     	<td rowspan="1" colspan="1">20050523</td>
+     	<td rowspan="1" colspan="1">AGR</td>
+     	<td rowspan="1" colspan="1">Reordered some paragraphs to improve consistency.</td>
+     </tr>
+ 
+     <tr>
      	<td rowspan="1" colspan="1">20050522</td>
      	<td rowspan="1" colspan="1">AGR</td>

--- wsdl20.pdf DELETED ---

Index: wsdl20.html
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20.html,v
retrieving revision 1.189
retrieving revision 1.190
diff -C2 -d -r1.189 -r1.190
*** wsdl20.html	23 May 2005 00:53:22 -0000	1.189
--- wsdl20.html	25 May 2005 21:30:50 -0000	1.190
***************
*** 493,496 ****
--- 493,498 ----
    </p>
    
+   <a name="zed-ComponentModel"></a>
+   
    <p>
    Components are typed collections of properties that correspond to  
***************
*** 511,514 ****
--- 513,518 ----
    
    <a name="zed-ComponentModel1"></a>
+    
+    <a name="zed-IdentifierValid"></a>
    
    <a name="zed-InterfaceComponents"></a>
***************
*** 532,542 ****
  	  <a name="zed-Base"></a>
  	  
! 	  <a name="zed-BaseRI"></a>
! 	  
! 	  <a name="zed-BaseParent"></a>
  	  
  	  <a name="zed-NestedBase"></a>
  	  
! 	  <a name="zed-NestedBaseRI"></a>
  	  
    <p>
--- 536,544 ----
  	  <a name="zed-Base"></a>
  	  
! 	  <a name="zed-BaseValid"></a>
  	  
  	  <a name="zed-NestedBase"></a>
  	  
! 	  <a name="zed-NestedBaseValid"></a>
  	  
    <p>
***************
*** 628,635 ****
        <a name="zed-Parent"></a>
        
!       <a name="zed-ParentRI"></a>
!      
! 
! 
        <p>Type system components describe the constraints on a
        message's content. By default, these constraints are expressed
--- 630,635 ----
        <a name="zed-Parent"></a>
        
!       <a name="zed-ParentValid"></a>
!    
        <p>Type system components describe the constraints on a
        message's content. By default, these constraints are expressed
***************
*** 651,659 ****
        <a name="zed-ElementDeclaration"></a>
        
!        <a name="zed-ElementDeclarationKey"></a>
  
        <a name="zed-TypeDefinition"></a>
        
!        <a name="zed-TypeDefinitionKey"></a>
  
        <p>The properties of the Description component are as follows:</p>
--- 651,659 ----
        <a name="zed-ElementDeclaration"></a>
        
!        <a name="zed-ElementDeclarationCM"></a>
  
        <a name="zed-TypeDefinition"></a>
        
!        <a name="zed-TypeDefinitionCM"></a>
  
        <p>The properties of the Description component are as follows:</p>
***************
*** 681,685 ****
  <a name="zed-DescriptionKey"></a>
  
! <a name="zed-DescriptionRI"></a>
  
         <p>
--- 681,685 ----
  <a name="zed-DescriptionKey"></a>
  
! <a name="zed-DescriptionCM"></a>
  
         <p>
***************
*** 1037,1044 ****
  	  </ul>
  	  
! <a name="zed-Interface"></a>
  
  	  <a name="zed-InterfaceRI"></a>
  	  
  	  <a name="zed-InterfaceParent"></a>
  	  
--- 1037,1050 ----
  	  </ul>
  	  
! 		<a name="zed-Interface"></a>
  
  	  <a name="zed-InterfaceRI"></a>
  	  
+ 	  <p>For each Interface component in the {interfaces}
+ 	  property of a Description component, the {name} property MUST be unique.
+ 	  </p>
+ 	  
+        <a name="zed-InterfaceKey"></a>
+ 
  	  <a name="zed-InterfaceParent"></a>
  	  
***************
*** 1051,1059 ****
  	  <a name="zed-InterfaceAllInterfaceFaults"></a>
  	  
! 	  <p>For each Interface component in the {interfaces}
! 	  property of a description container, the {name} property MUST be unique.
! 	  </p>
! 	  
!        <a name="zed-InterfaceKey"></a>
  
      </div>
--- 1057,1061 ----
  	  <a name="zed-InterfaceAllInterfaceFaults"></a>
  	  
! 	  <a name="zed-InterfaceCM"></a>
  
      </div>
***************
*** 1392,1400 ****
  	  <a name="zed-InterfaceFaultRI"></a>
  	  
-         <p>If a type system NOT based on the XML Infoset [<cite><a href="#XMLInfoSet">XML Information Set</a></cite>] is in use (as considered in <a href="#other-types"><b>3.2 Using Other Schema Languages</b></a>) then additional properties would need to
-         be added to the Interface Fault Component (along with extensibility
-         attributes to its XML representation) to allow associating
-         such message types with the message reference.</p>
- 
          <p>For each Interface Fault component in the {interface faults}
  	property of an Interface component, the {name} property must be unique.</p>
--- 1394,1397 ----
***************
*** 1423,1426 ****
--- 1420,1425 ----
  	properties but are not equivalent.</p>
  
+ 	<a name="zed-InterfaceFaultNameUnique"></a>
+ 
        <p> Note that, due to the above rules, if two interfaces that
  	  have the same value for the namespace name of their {name} property
***************
*** 1437,1440 ****
--- 1436,1446 ----
  	  inadvertent error.</p></div>
  
+         <p>If a type system NOT based on the XML Infoset [<cite><a href="#XMLInfoSet">XML Information Set</a></cite>] is in use (as considered in <a href="#other-types"><b>3.2 Using Other Schema Languages</b></a>) then additional properties would need to
+         be added to the Interface Fault Component (along with extensibility
+         attributes to its XML representation) to allow associating
+         such message types with the message reference.</p>
+ 
+ 	  <a name="zed-InterfaceFaultCM"></a>
+ 
      </div>
  
***************
*** 1702,1711 ****
  	  </ul>
  
! <a name="zed-InterfaceOperation"></a>
! 
  	  <a name="zed-InterfaceOperationRI"></a>
  
- 	  <a name="zed-InterfaceOperationParent"></a>
- 
          <p>For each Interface Operation component in the {interface operations}
  	property of an Interface component, the {name} property MUST be unique.</p>
--- 1708,1715 ----
  	  </ul>
  
! 		<a name="zed-InterfaceOperation"></a>
! 		
  	  <a name="zed-InterfaceOperationRI"></a>
  
          <p>For each Interface Operation component in the {interface operations}
  	property of an Interface component, the {name} property MUST be unique.</p>
***************
*** 1733,1736 ****
--- 1737,1742 ----
  	components have the same value for their {name}
  	property but are not equivalent.</p>
+ 	
+ 	<a name="zed-InterfaceOperationNameUnique"></a>
  
            <p> Note that, due to the above rules, if two interfaces that
***************
*** 1754,1757 ****
--- 1760,1767 ----
          more than one type of fault that is related to that message.</p>
  
+ 	  <a name="zed-InterfaceOperationParent"></a>
+ 
+  	  <a name="zed-InterfaceOperationCM"></a>
+ 
        <div class="div4">
          
***************
*** 2172,2175 ****
--- 2182,2191 ----
  	  <a name="zed-InterfaceMessageReferenceRI"></a>
  
+         <p> For each Interface Message Reference component in the {interface message
+         references} property of an Interface Operation component, its
+         {message label} property MUST be unique.</p>
+ 
+        <a name="zed-InterfaceMessageReferenceKey"></a>
+ 
          <p>If a type system not based upon the XML Infoset is in use (as considered
          in <a href="#other-types"><b>3.2 Using Other Schema Languages</b></a>) then additional properties would
***************
*** 2179,2187 ****
          reference.</p>
  
!         <p> For each Interface Message Reference component in the {interface message
!         references} property of an Interface Operation component, its
!         {message label} property MUST be unique.</p>
! 
!        <a name="zed-InterfaceMessageReferenceKey"></a>
  
      </div>
--- 2195,2199 ----
          reference.</p>
  
!  	  <a name="zed-InterfaceMessageReferenceCM"></a>
  
      </div>
***************
*** 2491,2494 ****
--- 2503,2508 ----
  	  <a name="zed-InterfaceFaultReference"></a>
  
+ 	  <a name="zed-InterfaceFaultReferenceRI"></a>
+ 
  	  <p>
  	  	For each Interface Fault Reference component in the {interface
***************
*** 2500,2507 ****
  	  <a name="zed-InterfaceFaultReferenceKey"></a>
  
! 	  <a name="zed-InterfaceFaultReferenceRI"></a>
! 
! 	  <a name="zed-InterfaceFaultReferenceOK"></a>
  	  
      </div>
  
--- 2514,2521 ----
  	  <a name="zed-InterfaceFaultReferenceKey"></a>
  
! 	  <a name="zed-InterfaceFaultReferenceConsistent"></a>
  	  
+  	  <a name="zed-InterfaceFaultReferenceCM"></a>
+ 
      </div>
  
***************
*** 2783,2786 ****
--- 2797,2804 ----
  	  </ul>
  	  
+ 	  <a name="zed-Feature"></a>
+ 	  
+ 	  <a name="zed-FeatureRI"></a>
+ 
  	  <p>
  	  	The {uri} property of a Feature component MUST be unique
***************
*** 2794,2801 ****
         <a name="zed-FeatureKey"></a>
  
! 	  <a name="zed-Feature"></a>
! 	  
! 	  <a name="zed-FeatureRI"></a>
! 
  	  <div class="div4">
  	    
--- 2812,2817 ----
         <a name="zed-FeatureKey"></a>
  
!  	  <a name="zed-FeatureCM"></a>
! 	  		
  	  <div class="div4">
  	    
***************
*** 2818,2822 ****
              
  	  <a name="zed-Features"></a>
! 
              <p> 
              Following these rules, the set of features
--- 2834,2840 ----
              
  	  <a name="zed-Features"></a>
! 	  
! 	  <a name="zed-FeaturesValid"></a>
! 	  
              <p> 
              Following these rules, the set of features
***************
*** 3158,3161 ****
--- 3176,3187 ----
  	  </ul>
  
+ 	  <a name="zed-ValueConstraint"></a>
+ 	  
+ 	  <a name="zed-ElementChildren"></a>
+ 	  	  
+ 	  <a name="zed-Property"></a>
+ 	  
+ 	  <a name="zed-PropertyRI"></a>
+ 
  	  <p>
  	  	The {uri} property of a Property component MUST be unique
***************
*** 3169,3180 ****
         <a name="zed-PropertyKey"></a>
  
- 	  <a name="zed-ValueConstraint"></a>
- 	  
- 	  <a name="zed-ElementChildren"></a>
- 	  	  
- 	  <a name="zed-Property"></a>
- 	  
- 	  <a name="zed-PropertyRI"></a>
- 
          <p>If a type system not based upon the XML Infoset is in use (as considered
          in <a href="#other-types"><b>3.2 Using Other Schema Languages</b></a>) then additional properties would
--- 3195,3198 ----
***************
*** 3184,3187 ****
--- 3202,3207 ----
          for properties.</p>
  
+  	  <a name="zed-PropertyCM"></a>
+ 	  		
  	  <div class="div4">
  	    
***************
*** 3213,3216 ****
--- 3233,3238 ----
  	  <a name="zed-Properties"></a>
      
+ 	  <a name="zed-PropertiesValid"></a>
+ 	  
              <p>
              Following these rules, the set of properties
***************
*** 3614,3619 ****
  	  <a name="zed-BindingRI"></a>
  
- 	  <a name="zed-BindingParent"></a>
- 	  
        <p> For each Binding component in the {bindings} property of a
        description container, the {name} property MUST be unique.  </p>
--- 3636,3639 ----
***************
*** 3621,3624 ****
--- 3641,3648 ----
         <a name="zed-BindingKey"></a>
  
+ 	  <a name="zed-BindingParent"></a>
+ 	  
+  	  <a name="zed-BindingCM"></a>
+ 	  		
      </div>
  
***************
*** 3905,3911 ****
  	  <a name="zed-BindingFaultRI"></a>
  	  
- 	  <a name="zed-BindingFaultOK"></a>
- 
- 
        <p> For each Binding Fault component in the {binding faults} property of
        a Binding component, the {interface fault} property MUST be
--- 3929,3932 ----
***************
*** 3915,3918 ****
--- 3936,3943 ----
         <a name="zed-BindingFaultKey"></a>
  
+ 	  <a name="zed-BindingFaultConsistent"></a>
+ 
+  	  <a name="zed-BindingFaultCM"></a>
+ 	  		
      </div>
  
***************
*** 4063,4066 ****
--- 4088,4092 ----
  
      </div>
+     
    </div>
  
***************
*** 4133,4140 ****
  	  <a name="zed-BindingOperationRI"></a>
  
- 	  <a name="zed-BindingOperationParent"></a>
- 	  
- 	  <a name="zed-BindingOperationOK"></a>
- 
        <p> For each Binding Operation component in the {binding operations}
        property of a Binding component, the {interface operation}
--- 4159,4162 ----
***************
*** 4145,4148 ****
--- 4167,4176 ----
         <a name="zed-BindingOperationKey"></a>
  
+ 	  <a name="zed-BindingOperationParent"></a>
+ 	  
+ 	  <a name="zed-BindingOperationConsistent"></a>
+ 
+  	  <a name="zed-BindingOperationCM"></a>
+ 	  		
      </div>
  
***************
*** 4215,4220 ****
  			    		Zero or more
  			    		<code>feature</code> 
! 			    		<em>element information item</em>
! 			    		s (see
  			    		<a href="#Feature_XMLRep"><b>2.7.2 XML Representation of Feature Component</b></a>)
  			    	</p>
--- 4243,4247 ----
  			    		Zero or more
  			    		<code>feature</code> 
! 			    		<em>element information item</em>s (see
  			    		<a href="#Feature_XMLRep"><b>2.7.2 XML Representation of Feature Component</b></a>)
  			    	</p>
***************
*** 4225,4230 ****
  			    		Zero or more
  			    		<code>property</code> 
! 			    		<em>element information item</em>
! 			    		s (see
  			    		<a href="#Feature_XMLRep"><b>2.7.2 XML Representation of Feature Component</b></a>)
  			    	</p>
--- 4252,4256 ----
  			    		Zero or more
  			    		<code>property</code> 
! 			    		<em>element information item</em>s (see
  			    		<a href="#Feature_XMLRep"><b>2.7.2 XML Representation of Feature Component</b></a>)
  			    	</p>
***************
*** 4366,4371 ****
  	  <a name="zed-BindingMessageReferenceRI"></a>
  
-     <a name="zed-BindingMessageReferenceOK"></a>
- 
      <p>
      	For each Binding Message Reference component in the {binding
--- 4392,4395 ----
***************
*** 4378,4381 ****
--- 4402,4409 ----
         <a name="zed-BindingMessageReferenceKey"></a>
  
+     <a name="zed-BindingMessageReferenceConsistent"></a>
+ 
+  	  <a name="zed-BindingMessageReferenceCM"></a>
+ 	  		
      </div>
      
***************
*** 4424,4427 ****
--- 4452,4456 ----
  		  <p>If the {message exchange pattern} of the
  		  Interface Operation component being bound has only
+ 
  		  one message with a given value for {direction}, then
  		  the <code>messageLabel</code>  <em>attribute information item</em> is optional for
***************
*** 4596,4601 ****
  	  <a name="zed-BindingFaultReferenceRI"></a>
  
-     <a name="zed-BindingFaultReferenceOK"></a>
- 
         <p>For each Binding Fault Reference component in the {binding fault
         references} property of a Binding Operation component, the
--- 4625,4628 ----
***************
*** 4605,4608 ****
--- 4632,4639 ----
         <a name="zed-BindingFaultReferenceKey"></a>
  
+     <a name="zed-BindingFaultReferenceConsistent"></a>
+ 
+  	  <a name="zed-BindingFaultReferenceCM"></a>
+ 	  		
      </div>
  
***************
*** 4849,4854 ****
  	  <a name="zed-ServiceRI"></a>
  
- 	  <a name="zed-ServiceParent"></a>
- 	  
        <p> For each Service component in the {services} property of a
        description container, the {name} property MUST be unique. </p>
--- 4880,4883 ----
***************
*** 4856,4859 ****
--- 4885,4892 ----
         <a name="zed-ServiceKey"></a>
  
+ 	  <a name="zed-ServiceParent"></a>
+ 	  
+  	  <a name="zed-ServiceCM"></a>
+ 	  		
          <div class="div4">
            
***************
*** 5183,5186 ****
--- 5216,5226 ----
  	  <p>
  	  For each Endpoint component in the {endpoints} property of a
+ 	  Service component, the {name} property MUST be unique.
+ 	  </p>
+ 
+        <a name="zed-EndpointKey"></a>
+ 
+ 	  <p>
+ 	  For each Endpoint component in the {endpoints} property of a
  	  Service component, the {binding} property (see <a href="#Endpoint_details"><b>2.15.1 The Endpoint Component</b></a>) MUST either be a Binding component
  	  with an unspecified {interface} property (see <a href="#Binding_details"><b>2.9.1 The Binding Component</b></a> or a Binding component with an
***************
*** 5189,5200 ****
  	  </p>
  	  
! 	  <a name="zed-EndpointOK"></a>
  	  
! 	  <p>
! 	  For each Endpoint component in the {endpoints} property of a
! 	  Service component, the {name} property MUST be unique.
! 	  </p>
! 
!        <a name="zed-EndpointKey"></a>
      </div>
  
--- 5229,5236 ----
  	  </p>
  	  
! 	  <a name="zed-EndpointConsistent"></a>
  	  
!  	  <a name="zed-EndpointCM"></a>
! 	  		
      </div>
  
***************
*** 8103,8106 ****
--- 8139,8154 ----
      
      <tr>
+     	<td rowspan="1" colspan="1">20050525</td>
+     	<td rowspan="1" colspan="1">AGR</td>
+     	<td rowspan="1" colspan="1">Added final ComponentModel to Z Notation.</td>
+     </tr>
+ 
+     <tr>
+     	<td rowspan="1" colspan="1">20050523</td>
+     	<td rowspan="1" colspan="1">AGR</td>
+     	<td rowspan="1" colspan="1">Reordered some paragraphs to improve consistency.</td>
+     </tr>
+ 
+     <tr>
      	<td rowspan="1" colspan="1">20050522</td>
      	<td rowspan="1" colspan="1">AGR</td>

Received on Wednesday, 25 May 2005 21:30:55 UTC