2002/ws/desc/wsdl20 wsdldefs.xsl,NONE,1.1 xmlspec-wsdl.xsl,1.4,1.5 wsdl20.html,1.193,1.194 wsdl20-adjuncts.html,1.40,1.41 wsdl20.xml,1.276,1.277 xmlspec.dtd,1.11,1.12 wsdl20.tex,1.51,1.52 wsdl20-z-ie.html,1.19,1.20 wsdl20-z.html,1.35,1.36

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

Modified Files:
	xmlspec-wsdl.xsl wsdl20.html wsdl20-adjuncts.html wsdl20.xml 
	xmlspec.dtd wsdl20.tex wsdl20-z-ie.html wsdl20-z.html 
Added Files:
	wsdldefs.xsl 
Log Message:
Added markup for WSDL component and property definitions and references.

Index: wsdl20-adjuncts.html
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20-adjuncts.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** wsdl20-adjuncts.html	7 Jun 2005 08:08:15 -0000	1.40
--- wsdl20-adjuncts.html	8 Jun 2005 21:12:34 -0000	1.41
***************
*** 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 12 April 2005), 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>
[...11641 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: wsdl20-z-ie.html
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20-z-ie.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wsdl20-z-ie.html	26 May 2005 13:52:55 -0000	1.19
--- wsdl20-z-ie.html	8 Jun 2005 21:12:35 -0000	1.20
***************
*** 77,85 ****
  
  <hr><div class="toc">
! <h2><a name="shortcontents">Short Table of Contents</a></h2><p class="toc">1. <a href="#intro">Introduction</a><br>2. <a href="#component_model">Component Model</a><br>3. <a href="#eii-types">Types</a><br>4. <a href="#modularize">Modularizing WSDL 2.0 descriptions</a><br>5. <a href="#eii-documentation">Documentation</a><br>6. <a href="#language-extensibility">Language Extensibility</a><br>7. <a href="#wsdllocation">Locating WSDL 2.0 Documents</a><br>8. <a href="#conformance">Conformance</a><br>9. <a href="#Syntax-Summary">XML Syntax Summary (Non-Normative)</a><br>10. <a href="#References">References</a><br>A. <a href="#ietf-draft">The application/wsdl+xml Media Type</a><br>B. <a href="#acknowledgments">Acknowledgements</a> (Non-Normative)<br>C. <a href="#wsdl-uri-references">URI References for WSDL 2.0 Components</a> (Non-Normative)<br>D. <a href="#migration">Migrating from WSDL 1.1 to WSDL 2.0</a> (Non-Normative)<br>E. <a href="#other-schemalang">Examples of Specifications of Extension Elements for Alterative Schema
! Language Support.</a> (Non-Normative)<br>F. <a href="#changelog">Part 1 Change Log</a> (Non-Normative)<br></p></div><hr><div class="toc">
  <h2><a name="contents">Table of Contents</a></h2><p class="toc">1. <a href="#intro">Introduction</a><br>&nbsp;&nbsp;&nbsp;&nbsp;1.1 <a href="#intro_ws">Web Service</a><br>&nbsp;&nbsp;&nbsp;&nbsp;1.2 <a href="#markup">Document Conformance</a><br>&nbsp;&nbsp;&nbsp;&nbsp;1.3 <a href="#meaning">The Meaning of a Service Description</a><br>&nbsp;&nbsp;&nbsp;&nbsp;1.4 <a href="#notation">Notational Conventions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;1.4.1 <a href="#rfc2119keywords">RFC 2119 Keywords</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;1.4.2 <a href="#rfc3986namespaces">RFC 3986 Namespaces</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;1.4.3 <a href="#nsprefixes">Prefixes and Namespaces Used in This Specification</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;1.4.4 <a href="#terminology">Terms Used in This Specification</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;1.4.5 <a href="#xmlinfosetproperties">XML Information Set Properties</a><br>&nbsp;&nbsp;&nbp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;1.4.6 <a href="#wsdlcomponentmodelproperties">WSDL 2.0 Component Model Properties</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;1.4.7 <a href="#znotation">Z Notation</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;1.4.8 <a href="#bnfpseudoschemas">BNF Pseudo-Schemas</a><br>2. <a href="#component_model">Component Model</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.1 <a href="#Description">Description</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.1.1 <a href="#Description_details">The Description Component</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.1.2 <a href="#Description_XMLRep">XML Representation of Description Component</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.1.2.1 <a href="#Description_targetnamespace_attribute">targetNamespace attribute information item</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.1.3 <a href="#Description_Mapping">Mapping Description's XML Representation to Component
        Properties</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.2 <a href="#Interface">Interface</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.2.1 <a href="#Interface_details">The Interface Component</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.2.2 <a href="#Interface_XMLRep">XML Representation of Interface Component</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.2.2.1 <a href="#Interface_name_attribute">name attribute information item with interface [owner element]</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.2.2.2 <a href="#Interface_extends_attribute">extends attribute information item</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.2.2.3 <a href="#Interface_styleDefault_attribute">styleDefault attribute information item</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.2.3 <a href="#Interface_Mapping">Mapping Interface's XML Representation to Component Properties</a><br>&nbsp;&nbsp;&nsp;&nbsp;2.3 <a href="#InterfaceFault">Interface Fault</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.3.1 <a href="#InterfaceFault_details">The Interface Fault Component</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.3.2 <a href="#InterfaceFault_XMLRep">XML Representation of Interface Fault Component</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.3.2.1 <a href="#Interfacefault_name_attribute">name attribute information item with fault [owner element]</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.3.2.2 <a href="#Interface_element_attribute">element attribute information item with fault [owner element]</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.3.3 <a href="#InterfaceFault_Mapping">Mapping Interface Fault's XML Representation to
! 	  Component Properties</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.4 <a href="#InterfaceOperation">Interface Operation</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.4.1 <a href="#InterfaceOperation_details">The Interface Operation Component</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.4.1.1 <a href="#InterfaceOperationStyle">Operation Style</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.4.2 <a href="#InterfaceOperation_XMLRep">XML Representation of Interface Operation Component</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.4.2.1 <a href="#Interfaceoperation_name_attribute">name attribute information item with operation [owner element]</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.4.2.2 <a href="#Interfaceoperation_pattern_attribute">pattern attribute information item with operation [owner element]</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.4.2.3 <a href"#InterfaceOperation_style_attribute">style attribute information item with operation [owner element]</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.4.2.4 <a href="#InterfaceOperation_safe_attribute">safe attribute information item with operation [owner element]</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.4.3 <a href="#InterfaceOperation_Mapping">Mapping Interface Operation's XML Representation to
  	  Component Properties</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.5 <a href="#InterfaceMessageReference">Interface Message Reference</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.5.1 <a href="#InterfaceMessageReference_details">The Interface Message Reference Component</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.5.2 <a href="#InterfaceMessageReference_XMLRep">XML Representation of Interface Message Reference Component</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.5.2.1 <a href="#InterfaceMessageReference_messageReference_attribute">messageLabel attribute information item with input
          or output [owner element]</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.5.2.2 <a href="#InterfaceMessageReference_element_attribute">element attribute information item with input
--- 77,85 ----
[...998 lines suppressed...]
  	  spell out how extensibility elements/attributes play out in such
--- 11489,11493 ----
  	  <td rowspan="1" colspan="1">20030428</td>
  	  <td rowspan="1" colspan="1">MJG</td>
! 	  <td rowspan="1" colspan="1">Various edits to <a href="#eii-types"><b>3. Types</b></a>, <a href="#other-schemalang"><b>D. Examples of Specifications of Extension Elements for Alternative Schema
  Language Support.</b></a> to accommodate other type systems and
  	  spell out how extensibility elements/attributes play out in such
***************
*** 11712,11716 ****
  	  <td rowspan="1" colspan="1">20030313</td>
  	  <td rowspan="1" colspan="1">MJG</td>
! 	  <td rowspan="1" colspan="1">Added text to <a href="#mig_porttypes"><b>D.2 PortTypes</b></a></td>
  	</tr>
  	<tr>
--- 11537,11541 ----
  	  <td rowspan="1" colspan="1">20030313</td>
  	  <td rowspan="1" colspan="1">MJG</td>
! 	  <td rowspan="1" colspan="1">Added text to 'mig_porttypes'</td>
  	</tr>
  	<tr>

Index: wsdl20.tex
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20.tex,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** wsdl20.tex	26 May 2005 13:52:55 -0000	1.51
--- wsdl20.tex	8 Jun 2005 21:12:35 -0000	1.52
***************
*** 1300,1304 ****
        	other nested components. The component that contains
        	a nested component is referred to as the \textit{parent}
!       	of the nested components. Nested components have a \{parent\}
        	property that is a reference to their parent component.
        
--- 1300,1304 ----
        	other nested components. The component that contains
        	a nested component is referred to as the \textit{parent}
!       	of the nested components. Nested components have a parent
        	property that is a reference to their parent component.
        
***************
*** 1310,1314 ****
        	Let
        	$Parent$
!       	represent the \{parent\} property of a nested component:
        
        
--- 1310,1314 ----
        	Let
        	$Parent$
!       	represent the parent property of a nested component:
        
        
***************
*** 1484,1501 ****
        The properties of the Description component are as follows:
  	  \begin{itemize}
! 	    \item \{interfaces\} OPTIONAL. A set of Interface components.
  	    
  
! 	    \item \{bindings\} OPTIONAL. A set of Binding components.
  	    
  
! 	    \item \{services\} OPTIONAL. A set of Service components.
  	    
  
! 	    \item \{element declarations\} OPTIONAL. A set of named element
  	    declarations, each one isomorphic to a global element
  	    declaration as defined by XML Schema.
  
! 	    \item \{type definitions\} OPTIONAL. A set of named type
  	    definitions, each one isomorphic to a global type definition
  	    as defined by XML Schema.
--- 1484,1501 ----
        The properties of the Description component are as follows:
  	  \begin{itemize}
! 	    \item interfaces OPTIONAL. A set of Interface components.
  	    
  
! 	    \item bindings OPTIONAL. A set of Binding components.
  	    
  
! 	    \item services OPTIONAL. A set of Service components.
  	    
  
! 	    \item element declarations OPTIONAL. A set of named element
  	    declarations, each one isomorphic to a global element
  	    declaration as defined by XML Schema.
  
! 	    \item type definitions OPTIONAL. A set of named type
  	    definitions, each one isomorphic to a global type definition
  	    as defined by XML Schema.
***************
*** 1915,1924 ****
  
  	  \begin{itemize}
! 	    \item \{name\} REQUIRED. An \textit{xs:QName}.
  
!         \item \{extended interfaces\} OPTIONAL. A set of declared Interface
          components which this interface extends. 
  
!   	    \item \{interface faults\} OPTIONAL. The set of declared Interface Fault
    	    components. 
    	    The namespace name of the \{name\} property of each Interface Fault in this set MUST be the
--- 1915,1924 ----
  
  	  \begin{itemize}
! 	    \item name REQUIRED. An \textit{xs:QName}.
  
!         \item extended interfaces OPTIONAL. A set of declared Interface
          components which this interface extends. 
  
!   	    \item interface faults OPTIONAL. The set of declared Interface Fault
    	    components. 
    	    The namespace name of the \{name\} property of each Interface Fault in this set MUST be the
***************
*** 1926,1930 ****
    	    
  
!   	    \item \{interface operations\} OPTIONAL. A set of declared Interface Operation
    	    components.
    	    The namespace name of the \{name\} property of each Interface Operation in this set MUST be the
--- 1926,1930 ----
    	    
  
!   	    \item interface operations OPTIONAL. A set of declared Interface Operation
    	    components.
    	    The namespace name of the \{name\} property of each Interface Operation in this set MUST be the
***************
*** 1932,1939 ****
    	    
  
!   	    \item \{features\} OPTIONAL. A set of declared Feature
    	    components.
  
!   	    \item \{properties\} OPTIONAL. A set of declared Property
    	    components.
  
--- 1932,1939 ----
    	    
  
!   	    \item features OPTIONAL. A set of declared Feature
    	    components.
  
!   	    \item properties OPTIONAL. A set of declared Property
    	    components.
  
***************
*** 2517,2521 ****
          it and indicating the contents of the fault message. When and
          how the fault message flows is indicated by the Interface
!         Operation component \hyperlink{InterfaceOperation}{\textbf{\ref*{InterfaceOperation} Interface Operation}}.
  
          The Interface Fault component provides a clear mechanism to
--- 2517,2521 ----
          it and indicating the contents of the fault message. When and
          how the fault message flows is indicated by the Interface
!         Operation component.
  
          The Interface Fault component provides a clear mechanism to
***************
*** 2537,2541 ****
          	\item 
          		
!         			\{name\} REQUIRED. An
          			\textit{xs:QName}.
          		
--- 2537,2541 ----
          	\item 
          		
!         			name REQUIRED. An
          			\textit{xs:QName}.
          		
***************
*** 2544,2551 ****
          	\item 
          		
!         			\{element declaration\} OPTIONAL. A reference to an XML element
!         			declaration in the \{element declarations\} property
!         			of
!         			\hyperlink{Description_details}{\textbf{\ref*{Description_details} The Description Component}}. 
          			This element represents the content or
          			``payload''
--- 2544,2550 ----
          	\item 
          		
!         			element declaration OPTIONAL. A reference to an XML element
!         			declaration in the element declarations property
!         			of the Description component.
          			This element represents the content or
          			``payload''
***************
*** 2555,2564 ****
  
          	\item 
!         		\{features\} OPTIONAL. A set of Feature components.
          	
  
          	\item 
          		
!         			\{properties\} OPTIONAL. A set of Property components.
          		
          	
--- 2554,2563 ----
  
          	\item 
!         		features OPTIONAL. A set of Feature components.
          	
  
          	\item 
          		
!         			properties OPTIONAL. A set of Property components.
          		
          	
***************
*** 2993,3007 ****
              absolute URIs (see \hyperlink{RFC3986}{[\textit{IETF RFC 3986}]}).
  
-             \item \{safety\} REQUIRED. An \textit{xs:boolean}
- 			indicating whether the
-             operation is asserted to be safe (as defined in Section
-             3.5 of \hyperlink{webarch}{[\textit{Web Architecture}]}) for users of the described
-             service to invoke.  If this property is false, then no
-             assertion has been made about the safety of
-             the operation, thus the operation MAY or MAY NOT be safe.
-             However, an operation SHOULD be marked safe if it meets
-             the criteria for a safe interaction defined in Section 3.5
-             of \hyperlink{webarch}{[\textit{Web Architecture}]}.
- 
              \item \{features\} OPTIONAL. A set of Feature components.
  
--- 2992,2995 ----
***************
*** 3024,3029 ****
  			interfaceMessageReferences : \power  ID \\
  			interfaceFaultReferences : \power  ID \\
! 			style : \power  AbsoluteURI \\
! 			safety : Boolean
  		\end{schema}
  		
--- 3012,3016 ----
  			interfaceMessageReferences : \power  ID \\
  			interfaceFaultReferences : \power  ID \\
! 			style : \power  AbsoluteURI
  		\end{schema}
  		
***************
*** 3278,3283 ****
            name="xs:NCName" 
            pattern="xs:anyURI"
!           style="list of xs:anyURI"? 
!           safe="xs:boolean"? >
        <documentation />?
        [ <feature /> | <property /> | 
--- 3265,3269 ----
            name="xs:NCName" 
            pattern="xs:anyURI"
!           style="list of xs:anyURI"? >
        <documentation />?
        [ <feature /> | <property /> | 
***************
*** 3321,3330 ****
  		\item 
  		  
- 		  An OPTIONAL \texttt{safe} \textit{attribute information item} as
- 		  described below in \hyperlink{InterfaceOperation_safe_attribute}{\textbf{\ref*{InterfaceOperation_safe_attribute} \texttt{safe} \textit{attribute information item} with \texttt{operation} [owner element]}}.
- 		  
- 		
- 		\item 
- 		  
  		  Zero or more namespace qualified \textit{attribute information item}s whose
  		  [namespace name] is
--- 3307,3310 ----
***************
*** 3453,3477 ****
        
  
-       \hypertarget{InterfaceOperation_safe_attribute}{}
- \subsubsection{\texttt{safe} \textit{attribute information item} with \texttt{operation} [owner element]}\label{InterfaceOperation_safe_attribute}
- 
-         
- 
- 	    The \texttt{safe} \textit{attribute information item} indicates whether the operation
-             is declared to be \textit{safe} or not.
- 
-              The \texttt{safe} \textit{attribute information item} has the following
-             Infoset properties: 
- 
- 		\begin{itemize}
- 		  \item A [local name] of \texttt{safe}
- 		  \item A [namespace name] which has no value
- 		\end{itemize}
- 
-              The type of the \texttt{safe} \textit{attribute information item} is
-             \textit{xs:boolean}. It does NOT have a default value.
- 
-       
- 
      
  
--- 3433,3436 ----
***************
*** 3505,3509 ****
  		  
  		    \{message exchange pattern\}&
! 			The actual value of the \texttt{pattern} \textit{attribute information item}.
  		  \\ \hline 
  		  
--- 3464,3469 ----
  		  
  		    \{message exchange pattern\}&
! 			The actual value of the \texttt{pattern} \textit{attribute information item};
! 			otherwise 'http://www.w3.org/@@@@/@@/wsdl/in-out'.
  		  \\ \hline 
  		  
***************
*** 3534,3544 ****
  		  \\ \hline 
  		  
- 		    \{safety\}&
- 			
- 			The actual value of the \texttt{safe} \textit{attribute information item}, if
- 			present, otherwise the value {\tt "false"}.
-                         
- 		  \\ \hline 
- 		  
  		    \{features\}&
  			
--- 3494,3497 ----
***************
*** 7081,7085 ****
  		  If the \{message exchange pattern\} of the
  		  Interface Operation component being bound has only
- 
  		  one message with a given value for \{direction\}, then
  		  the \texttt{messageLabel} \textit{attribute information item} is optional for
--- 7034,7037 ----
***************
*** 7756,7838 ****
  
  	  
- 	  		
-         \hypertarget{Service_OperationName}{}
- \subsubsection{Operation Name Mapping (non-normative)}\label{Service_OperationName}
  
-           
- 
-           
-               This section is best-practice and hence non-normative.
-           
-           
-           It is generally desirable that, when a message recipient receives a message,
-           it knows how to handle the message. In WSDL 2.0 terms, this means being
-           able to map back the message to a single Interface Operation. However,
-           this is NOT always possible. There are cases when multiple Interface Operations
-           could correspond to the same received message. This happens either when:
-           
-           
-           \begin{itemize}
-           \item the \{message content model\} property of any of these
-           Interface Message Reference components (see below) has a value of ``\#any''; or
-           
-           
-           \item more than one of these Interface Message Reference components (see below)
-           has a value of ``\#none''; or
-           
-           
-           \item the qualified names of the global element declarations specified
-           by the values of the \{element declaration\} properties of these Interface Message Reference
-           components (see below) are NOT unique when considered together.
-           
-           \end{itemize}
-           
-           The Interface Message Reference components above are defined as follows.
-           First, consider the Interface component specified in the \{interface\}
-           property of a Service component. Second, consider all Interface Operation
-           components specified in the \{interface operations\} property of that Interface
-           component and the Interface component it directly or indirectly extends.  
-           Third, consider all Interface Message Reference components specified
-           in the \{interface message references\} properties of said Interface Operation
-           components. Fourth, consider the Interface Message Reference components that
-           have the same value for their \{direction\} property (i.e., either the token
-           \textit{in} or the token \textit{out}). These are the Interface Message Reference
-           components considered above.
- 	  
- 	  If any of the three cases above arise, then one of the following two
- 	  alternatives can be used. Note these alternatives are in no way mandated by 
- 	  this specification and are considered best practice only.
- 	  
- 	  \begin{itemize}
- 	    \item \textbf{Feature}.
- 	          The \{features\} property of the Service or Interface components
-               contains a Feature component, having a \{required\} property with
- 	          a value of \textit{true}. The feature unambiguously identifies the
-               mechanism that a message sender is required to support in order to
-               enable the message recipient to unambiguously determine the name of the
- 	  Interface Operation component that is intended to be associated
- 	  with the received message.
- 	      
- 	    
- 	    \item \textbf{Extension}.
- 	    The \textit{element information item} for the Interface component
- 	    contains an extension element (i.e., an element that is not
- 	    in the http://www.w3.org/@@@@/@@/wsdl namespace), having a wsdl:required \textit{attribute information item} with
- 	    a value of {\tt "true"}. The extension element unambiguously identifies
- 	    the mechanism that a message sender is required to support in
- 	    order to enable the message recipient to unambiguously determine
- 	    the name of the Interface Operation component that is intended
- 	    to be associated with the received message.
- 	      
- 	    
- 	  \end{itemize}
- 	  
- 	  The WS-Addressing \hyperlink{ws-addr-core}{[\textit{WS-Addressing}]} specification allready
- 	  provides a disambiguation mechanism.
- 	  It defines an [action] property whose value is embedded in each message,
- 	  and that can be used to associate the message with a particular operation.
- 	  
- 
- 	  
      
  
--- 7708,7712 ----
***************
*** 10042,10053 ****
  	  
  
- 	  \hypertarget{webarch}{}\item[{[Web Architecture]}] \ 
- 
- 	    \href{http://www.w3.org/TR/2003/WD-webarch-20031209/}{Architecture of the World Wide Web, First
- 	    Edition}, Ian Jacobs, Editor. W3C Technical
- 	    Architecture Group, December, 2003.  Available at
- 	    http://www.w3.org/TR/2003/WD-webarch-20031209/.
- 	  
- 
  	  \hypertarget{ISO10646}{}\item[{[ISO/IEC 10646]}] \ 
  
--- 9916,9919 ----
***************
*** 10239,10245 ****
     This appendix defines the {\tt "application/wsdl+xml"}
     media type which can be used to describe WSDL 2.0 documents
!    serialized as XML. It is referenced by the corresponding IANA registration document
!    \hyperlink{wsdl-media-type}{[\textit{WSDL MediaType}]}, which is being submitted to the IESG for review, approval and
!    registration with IANA.
        
     
--- 10105,10109 ----
     This appendix defines the {\tt "application/wsdl+xml"}
     media type which can be used to describe WSDL 2.0 documents
!    serialized as XML.
        
     
***************
*** 11063,11149 ****
      
  
-     \hypertarget{migration}{}
- \chapter{Migrating from WSDL 1.1 to WSDL 2.0 (Non-Normative)}\label{migration}
- 
-       
-       This section will attempt to document some of the migration
-          concerns of going from WSDL 1.1 to WSDL 2.0. We do not claim
-          that all migration problems will be addressed here.
- 
-       \hypertarget{mig_ops}{}
- \section{Operation Overloading}\label{mig_ops}
- 
-         
-         WSDL 1.1 supported operation overloading, whereas WSDL 2.0 does not.
-         
-       
- 
-       \hypertarget{mig_porttypes}{}
- \section{PortTypes}\label{mig_porttypes}
- 
-         
-         Port types have been renamed to interfaces. We now have interface inheritance.
-       
- 
-       \hypertarget{mig_ports}{}
- \section{Ports}\label{mig_ports}
- 
-         
-         Ports have been renamed to endpoints.
-       
-       
-       \hypertarget{single_interface_per_service}{}
- \section{Single Interface per Service}\label{single_interface_per_service}
- 
-       	
-       	
-       		WSDL 2.0 requires that within a service, all endpoints (called ports in WSDL 1.1)
-       		implement exactly the same interface (called portType in WSDL 1.1).
-       		WSDL 1.1 imposed no such restriction. WSDL 1.1 documents could contain ports, from the same service,
-       		that implemented differents portTypes. Such WSDL 1.1 documents must therefore be converted, before
-       		they are valid WSDL 2.0 documents. Note: other types of conversions may also be required,
-       		because of other differences between WSDL 2.0 and WSDL 1.1. These differences are not considered
-       		further in this section.
-       	
-       	
-       		To convert a WSDL 1.1 document that contains ports from the same service that implement different
-       		portTypes, one must first move each portType implementing a different port to a new service. The new service
-       		is a replica of the original service, apart from the fact that it implements a different set of portTypes.
-       	
-       	
-       		Is is then generally desirable to indicate that the new services are related to each other.
-       		This can be achieved by using one of the following alternatives:
-       	
-       	\begin{itemize}
-       		\item 
-       		\textbf{Single document}.
-       		Keep the new services under the same \texttt{definition} \textit{element information item}.
-       		
-       		
-       		\item 
-       		\textbf{Multiple documents, same targetNamespace}.
-       		Split the new services over multiple WSDL 2.0 documents,
-       		each with the same \texttt{targetNamespace}.
-       		
-       		
-       		\item 
-       		\textbf{Multiple documents, same endpoint}.
-       		Split the new services in multiple WSDL 2.0 documents,
-       		each with the same \texttt{endpoint}. Note that this provides
-       		a looser coupling that the \texttt{targetNamespace} alternative above.
-       		
-       		
-       		\item 
-       		\textbf{Extension}.
-       		Use a WSDL 2.0 extension whose semantics would be to link the new services
-       		together. This is somewhat analoguous to the \texttt{targetNamespace} approach above,
-       		although such an extension may carry additional semantics.
-       		The definition of such an extension is outside the scope of this specification.
-       		
-       	\end{itemize}
-       
- 
-     
- 
      \hypertarget{other-schemalang}{}
  \chapter{Examples of Specifications of Extension Elements for Alternative Schema
--- 10927,10930 ----
***************
*** 11390,11393 ****
--- 11171,11208 ----
      
      
+     	20050608&
+     	AGR&
+     	Added markup for WSDL component and property definitions and references.
+     \\ \hline 
+ 
+     
+     	20050602&
+     	HH&
+     	\href{http://www.w3.org/2002/ws/desc/4/lc-issues/issues.html#LC75c}{LC75c}: 
+     	moved safety to Part 2.
+     \\ \hline 
+ 
+     
+     	20050601&
+     	JJM&
+     	\href{http://www.w3.org/2002/ws/desc/4/lc-issues/issues.html#LC75}{LC75x}: 
+     	removed appendix "migrating from WSDL 1.1 to WSDL 2.0".
+     \\ \hline 
+     
+     
+     	20050531&
+     	JJM&
+     	\href{http://www.w3.org/2002/ws/desc/4/lc-issues/issues.html#LC82}{LC82}: 
+     	removed ONMR section (transfer to primer).
+     \\ \hline 
+      
+     
+     	20050531&
+     	JJM&
+     	\href{http://www.w3.org/2002/ws/desc/4/lc-issues/issues.html#LC71}{LC71}: 
+     	added default value for pattern attribute (".../inout").
+     \\ \hline 
+    
+     
      	20050526&
      	AGR&
***************
*** 12012,12016 ****
      		\href{http://www.w3.org/2002/ws/desc/4/lc-issues/issues.html#LC73}{LC73}
      		\href{http://www.w3.org/2002/ws/desc/4/lc-issues/issues.html#LC75n}{LC75n}:
!     		Added \hyperlink{single_interface_per_service}{\textbf{\ref*{single_interface_per_service} Single Interface per Service}}.
      	
      \\ \hline 
--- 11827,11831 ----
      		\href{http://www.w3.org/2002/ws/desc/4/lc-issues/issues.html#LC73}{LC73}
      		\href{http://www.w3.org/2002/ws/desc/4/lc-issues/issues.html#LC75n}{LC75n}:
!     		Added "single\_interface\_per\_service".
      	
      \\ \hline 
***************
*** 12756,12760 ****
  	  20030313&
  	  MJG&
! 	  Added text to \hyperlink{mig_porttypes}{\textbf{\ref*{mig_porttypes} PortTypes}}
  	\\ \hline 
  	
--- 12571,12575 ----
  	  20030313&
  	  MJG&
! 	  Added text to 'mig\_porttypes'
  	\\ \hline 
  	

Index: wsdl20.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20.xml,v
retrieving revision 1.276
retrieving revision 1.277
diff -C2 -d -r1.276 -r1.277
*** wsdl20.xml	7 Jun 2005 10:00:00 -0000	1.276
--- wsdl20.xml	8 Jun 2005 21:12:35 -0000	1.277
***************
*** 1265,1269 ****
        <head>The Description Component</head>
        
!       <p>At the abstract level, the Description component is just a
        container for two categories of components: WSDL 2.0 components and
        type system components.</p>
--- 1265,1269 ----
        <head>The Description Component</head>
        
!       <p>At the abstract level, the <comp>Description</comp> component is just a
        container for two categories of components: WSDL 2.0 components and
        type system components.</p>
***************
*** 1276,1289 ****
  
        <p>
!       	Interface, Binding, Service, Element Declaration, and Type
!       	Definition components are directly contained in the
!       	Description component and are referred to as
        	<emph>top-level components</emph>. 
        	The top-level WSDL 2.0 components contain other components, e.g.
!       	Interface Operation and Endpoint, which are referred to as
        	<emph>nested components</emph>. Nested components may contain
        	other nested components. The component that contains
        	a nested component is referred to as the <emph>parent</emph>
!       	of the nested components. Nested components have a {parent}
        	property that is a reference to their parent component.
        </p>
--- 1276,1289 ----
  
        <p>
!       	<comp>Interface</comp>, <comp>Binding</comp>, <comp>Service</comp>, <comp>Element Declaration</comp>, and <comp>Type
!       	Definition</comp> components are directly contained in the
!       	<comp>Description</comp> component and are referred to as
        	<emph>top-level components</emph>. 
        	The top-level WSDL 2.0 components contain other components, e.g.
!       	<comp>Interface Operation</comp> and <comp>Endpoint</comp>, which are referred to as
        	<emph>nested components</emph>. Nested components may contain
        	other nested components. The component that contains
        	a nested component is referred to as the <emph>parent</emph>
!       	of the nested components. Nested components have a <propdef comp="">parent</propdef>
        	property that is a reference to their parent component.
        </p>
***************
*** 1294,1298 ****
        	Let
        	<z:i>Parent</z:i>
!       	represent the {parent} property of a nested component:
        </p>
        
--- 1294,1298 ----
        	Let
        	<z:i>Parent</z:i>
!       	represent the <prop comp="">parent</prop> property of a nested component:
        </p>
        
***************
*** 1460,1479 ****
  		</z:notation>
  
!       <p>The properties of the Description component are as follows:</p>
  	  <ulist>
! 	    <item><p>{interfaces} OPTIONAL. A set of Interface components.
  	    </p></item>
  
! 	    <item><p>{bindings} OPTIONAL. A set of Binding components.
  	    </p></item>
  
! 	    <item><p>{services} OPTIONAL. A set of Service components.
  	    </p></item>
  
! 	    <item><p>{element declarations} OPTIONAL. A set of named element
  	    declarations, each one isomorphic to a global element
  	    declaration as defined by XML Schema.</p></item>
  
! 	    <item><p>{type definitions} OPTIONAL. A set of named type
  	    definitions, each one isomorphic to a global type definition
  	    as defined by XML Schema.</p></item>
--- 1460,1479 ----
  		</z:notation>
  
!       <p>The properties of the <compdef>Description</compdef> component are as follows:</p>
  	  <ulist>
! 	    <item><p><propdef comp="Description">interfaces</propdef> OPTIONAL. A set of <comp>Interface</comp> components.
  	    </p></item>
  
! 	    <item><p><propdef comp="Description">bindings</propdef> OPTIONAL. A set of <comp>Binding</comp> components.
  	    </p></item>
  
! 	    <item><p><propdef comp="Description">services</propdef> OPTIONAL. A set of <comp>Service</comp> components.
  	    </p></item>
  
! 	    <item><p><propdef comp="Description">element declarations</propdef> OPTIONAL. A set of named element
  	    declarations, each one isomorphic to a global element
  	    declaration as defined by XML Schema.</p></item>
  
! 	    <item><p><propdef comp="Description">type definitions</propdef> OPTIONAL. A set of named type
  	    definitions, each one isomorphic to a global type definition
  	    as defined by XML Schema.</p></item>
***************
*** 1890,1903 ****
          components refer to interfaces in this way.  </p>
  
!         <p>The properties of the Interface component are as
          follows:</p>
  
  	  <ulist>
! 	    <item><p>{name} REQUIRED. An <emph>xs:QName</emph>.</p></item>
  
!         <item><p>{extended interfaces} OPTIONAL. A set of declared Interface
          components which this interface extends.</p> </item>
  
!   	    <item><p>{interface faults} OPTIONAL. The set of declared Interface Fault
    	    components. 
    	    The namespace name of the {name} property of each Interface Fault in this set MUST be the
--- 1890,1903 ----
          components refer to interfaces in this way.  </p>
  
!         <p>The properties of the <compdef>Interface</compdef> component are as
          follows:</p>
  
  	  <ulist>
! 	    <item><p><propdef comp="Interface">name</propdef> REQUIRED. An <emph>xs:QName</emph>.</p></item>
  
!         <item><p><propdef comp="Interface">extended interfaces</propdef> OPTIONAL. A set of declared Interface
          components which this interface extends.</p> </item>
  
!   	    <item><p><propdef comp="Interface">interface faults</propdef> OPTIONAL. The set of declared Interface Fault
    	    components. 
    	    The namespace name of the {name} property of each Interface Fault in this set MUST be the
***************
*** 1905,1909 ****
    	    </p></item>
  
!   	    <item><p>{interface operations} OPTIONAL. A set of declared Interface Operation
    	    components.
    	    The namespace name of the {name} property of each Interface Operation in this set MUST be the
--- 1905,1909 ----
    	    </p></item>
  
!   	    <item><p><propdef comp="Interface">interface operations</propdef> OPTIONAL. A set of declared Interface Operation
    	    components.
    	    The namespace name of the {name} property of each Interface Operation in this set MUST be the
***************
*** 1911,1918 ****
    	    </p></item>
  
!   	    <item><p>{features} OPTIONAL. A set of declared Feature
    	    components.</p></item>
  
!   	    <item><p>{properties} OPTIONAL. A set of declared Property
    	    components.</p></item>
  
--- 1911,1918 ----
    	    </p></item>
  
!   	    <item><p><propdef comp="Interface">features</propdef> OPTIONAL. A set of declared Feature
    	    components.</p></item>
  
!   	    <item><p><propdef comp="Interface">properties</propdef> OPTIONAL. A set of declared Property
    	    components.</p></item>
  
***************
*** 2483,2488 ****
          Interface Fault component declares an abstract fault by naming
          it and indicating the contents of the fault message. When and
!         how the fault message flows is indicated by the Interface
!         Operation component <specref ref="InterfaceOperation"/>.</p>
  
          <p>The Interface Fault component provides a clear mechanism to
--- 2483,2488 ----
          Interface Fault component declares an abstract fault by naming
          it and indicating the contents of the fault message. When and
!         how the fault message flows is indicated by the <comp>Interface
!         Operation</comp> component.</p>
  
          <p>The Interface Fault component provides a clear mechanism to
***************
*** 2499,2508 ****
          i.e. faults are an open set.</p>
  
!         <p>The properties of the Interface Fault component are
          as follows:</p>
          <ulist>
          	<item>
          		<p>
!         			{name} REQUIRED. An
          			<emph>xs:QName</emph>.
          		</p>
--- 2499,2508 ----
          i.e. faults are an open set.</p>
  
!         <p>The properties of the <compdef>Interface Fault</compdef> component are
          as follows:</p>
          <ulist>
          	<item>
          		<p>
!         			<propdef comp="Interface Fault">name</propdef> REQUIRED. An
          			<emph>xs:QName</emph>.
          		</p>
***************
*** 2511,2518 ****
          	<item>
          		<p>
!         			{element declaration} OPTIONAL. A reference to an XML element
!         			declaration in the {element declarations} property
!         			of
!         			<specref ref='Description_details' />. 
          			This element represents the content or
          			&ldquo;payload&rdquo;
--- 2511,2517 ----
          	<item>
          		<p>
!         			<propdef comp="Interface Fault">element declaration</propdef> OPTIONAL. A reference to an XML element
!         			declaration in the <prop comp="Description">element declarations</prop> property
!         			of the <comp>Description</comp> component.
          			This element represents the content or
          			&ldquo;payload&rdquo;
***************
*** 2522,2531 ****
  
          	<item>
!         		<p>{features} OPTIONAL. A set of Feature components.</p>
          	</item>
  
          	<item>
          		<p>
!         			{properties} OPTIONAL. A set of Property components.
          		</p>
          	</item>
--- 2521,2530 ----
  
          	<item>
!         		<p><propdef comp="Interface Fault">features</propdef> OPTIONAL. A set of Feature components.</p>
          	</item>
  
          	<item>
          		<p>
!         			<propdef comp="Interface Fault">properties</propdef> OPTIONAL. A set of Property components.
          		</p>
          	</item>
***************
*** 2930,2934 ****
          used as the value of the {message exchange pattern} property.</p>
  
!         <p>The properties of the Interface Operation component are
          as follows:</p>
  	  <ulist>
--- 2929,2933 ----
          used as the value of the {message exchange pattern} property.</p>
  
!         <p>The properties of the <compdef>Interface Operation</compdef> component are
          as follows:</p>
  	  <ulist>
***************
*** 3507,3511 ****
  	by the Interface Message Reference component.</p>
  
!         <p>The properties of the Interface Message Reference component are as
  	follows:</p>
  	  <ulist>
--- 3506,3510 ----
  	by the Interface Message Reference component.</p>
  
!         <p>The properties of the <compdef>Interface Message Reference</compdef> component are as
  	follows:</p>
  	  <ulist>
***************
*** 3948,3952 ****
          in the pattern.</p>
  
!         <p>The properties of the Interface Fault Reference component are as
  	follows:</p>
  	  <ulist>
--- 3947,3951 ----
          in the pattern.</p>
  
!         <p>The properties of the <compdef>Interface Fault Reference</compdef> component are as
  	follows:</p>
  	  <ulist>
***************
*** 4388,4392 ****
        used directly.</p>
  	  
! 	  <p>The properties of the Feature component are as follows:</p>
  	  <ulist>
  	    <item><p>{uri} REQUIRED. An <emph>xs:anyURI</emph>. 
--- 4387,4391 ----
        used directly.</p>
  	  
! 	  <p>The properties of the <compdef>Feature</compdef> component are as follows:</p>
  	  <ulist>
  	    <item><p>{uri} REQUIRED. An <emph>xs:anyURI</emph>. 
***************
*** 4901,4905 ****
            </p>
  
! 	  <p>The properties of the Property component are as follows:</p>
  	  <ulist>
  	    <item><p>{uri} REQUIRED. An <emph>xs:anyURI</emph>. This
--- 4900,4904 ----
            </p>
  
! 	  <p>The properties of the <compdef>Property</compdef> component are as follows:</p>
  	  <ulist>
  	    <item><p>{uri} REQUIRED. An <emph>xs:anyURI</emph>. This
***************
*** 5538,5542 ****
        components refer to bindings in this way.  </p>
  
!       <p>The properties of the Binding component are as follows:</p>
  	  <ulist>
  	    <item><p>{name} REQUIRED. An <emph>xs:QName</emph>.</p></item>
--- 5537,5541 ----
        components refer to bindings in this way.  </p>
  
!       <p>The properties of the <compdef>Binding</compdef> component are as follows:</p>
  	  <ulist>
  	    <item><p>{name} REQUIRED. An <emph>xs:QName</emph>.</p></item>
***************
*** 5955,5959 ****
        a message exchange of an operation will be formatted and carried in the transport.</p>
  
!       <p>The properties of the Binding Fault component are as
        follows:</p>
  
--- 5954,5958 ----
        a message exchange of an operation will be formatted and carried in the transport.</p>
  
!       <p>The properties of the <compdef>Binding Fault</compdef> component are as
        follows:</p>
  
***************
*** 6284,6288 ****
        an interface is uniquely identified by its {name} property.</p>
  
!       <p>The properties of the Binding Operation component are as
        follows:</p>
  
--- 6283,6287 ----
        an interface is uniquely identified by its {name} property.</p>
  
!       <p>The properties of the <compdef>Binding Operation</compdef> component are as
        follows:</p>
  
***************
*** 6708,6712 ****
          to a particular concrete message format.  </p>
  
!         <p>The properties of the Binding Message Reference component
          are as follows:</p>
  
--- 6707,6711 ----
          to a particular concrete message format.  </p>
  
!         <p>The properties of the <compdef>Binding Message Reference</compdef> component
          are as follows:</p>
  
***************
*** 7061,7065 ****
          to a particular concrete message format.  </p>
  
!         <p>The properties of the Binding Fault Reference component
          are as follows:</p>
  
--- 7060,7064 ----
          to a particular concrete message format.  </p>
  
!         <p>The properties of the <compdef>Binding Fault Reference</compdef> component
          are as follows:</p>
  
***************
*** 7436,7440 ****
        (see <specref ref='qnameres' />).  </p>
  
!       <p>The properties of the Service component are as follows:</p>
  	  <ulist>
  	    <item><p>{name} REQUIRED. An <emph>xs:QName</emph>.</p></item>
--- 7435,7439 ----
        (see <specref ref='qnameres' />).  </p>
  
!       <p>The properties of the <compdef>Service</compdef> component are as follows:</p>
  	  <ulist>
  	    <item><p>{name} REQUIRED. An <emph>xs:QName</emph>.</p></item>
***************
*** 7782,7786 ****
  	  cannot be referred to by QName (see <specref ref='frag-ids' />).
  	  </p>
! 	  <p>The properties of the Endpoint component are as follows:</p>
  	  <ulist>
  	    <item><p>{name} REQUIRED. An <emph>xs:NCName</emph>.</p></item>
--- 7781,7785 ----
  	  cannot be referred to by QName (see <specref ref='frag-ids' />).
  	  </p>
! 	  <p>The properties of the <compdef>Endpoint</compdef> component are as follows:</p>
  	  <ulist>
  	    <item><p>{name} REQUIRED. An <emph>xs:NCName</emph>.</p></item>
***************
*** 10885,10888 ****
--- 10884,10893 ----
        <th>Description</th>
      </tr>
+     
+     <tr>
+     	<td>20050608</td>
+     	<td>AGR</td>
+     	<td>Added markup for WSDL component and property definitions and references.</td>
+     </tr>
  
      <tr>

Index: xmlspec-wsdl.xsl
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/xmlspec-wsdl.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** xmlspec-wsdl.xsl	18 Jan 2005 00:23:53 -0000	1.4
--- xmlspec-wsdl.xsl	8 Jun 2005 21:12:33 -0000	1.5
***************
*** 5,8 ****
--- 5,9 ----
  
    <xsl:import href="xmlspec.xsl"/>
+   <xsl:import href="wsdldefs.xsl"/>
    <xsl:import href="zml2html.xsl"/>
  

Index: wsdl20-z.html
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20-z.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** wsdl20-z.html	7 Jun 2005 10:01:16 -0000	1.35
--- wsdl20-z.html	8 Jun 2005 21:12:35 -0000	1.36
***************
*** 1,13 ****
! <?xml version="1.0" encoding="utf-8"?>
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
! <head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
! <meta name="generator" content="HTML Tidy for Linux/x86 (vers 12 April 2005), see www.w3.org" />
! 
! <title>Web Services Description Language (WSDL) Version 2.0 Part 1:
! Core Language</title>
! 
! <style type="text/css" xml:space="preserve">
[...26858 lines suppressed...]
!     <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>
\ No newline at end of file

--- NEW FILE: wsdldefs.xsl ---
<?xml version="1.0" encoding="UTF-8"?>

<!-- 
	
	Version: $Id: wsdldefs.xsl,v 1.1 2005/06/08 21:12:35 aryman Exp $
	
	This stylesheet renders WSDL definition markup as HTML.
	
	This stylesheet is copyright (c) 2004 by its authors.  Free
	distribution and modification is permitted, including adding to
	the list of authors and copyright holders, as long as this
	copyright notice is maintained. 
	
	Change Log:
	
	2005-06-08: Arthur Ryman <ryman@ca.ibm.com>
	- created
	
-->

<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
	version="1.0">

	<xsl:variable name="component-prefix">component-</xsl:variable>
	<xsl:variable name="property-prefix">property-</xsl:variable>

	<!-- 
		
		Component definition.
		
		Transform:
		
		<compdef>Interface Operation</compdef>
		
		to:
		
		<a name="component-InterfaceOperation">Interface Operation</a>
		
	-->

	<xsl:template match="compdef">
		<xsl:variable name="anchor">
			<xsl:call-template name="component-anchor">
				<xsl:with-param name="component" select="." />
			</xsl:call-template>
		</xsl:variable>
		<a name="{$anchor}">
			<xsl:value-of select="." />
		</a>
	</xsl:template>
	
	<!-- 
		
		Component reference.
		
		Transform:
		
		<comp>Interface Operation</comp>
		
		to:
		
		<a href="#InterfaceOperation-component">Interface Operation</a>
		
	-->

	<xsl:template match="comp">
		<xsl:variable name="anchor">
			<xsl:call-template name="component-anchor">
				<xsl:with-param name="component" select="." />
			</xsl:call-template>
		</xsl:variable>
		<a href="#{$anchor}">
			<xsl:value-of select="." />
		</a>
	</xsl:template>
	
	<xsl:template name="component-anchor">
		<xsl:param name="component" />
		<xsl:variable name="component-label">
			<xsl:call-template name="remove-whitespace">
				<xsl:with-param name="text" select="$component" />
			</xsl:call-template>
		</xsl:variable>
		<xsl:value-of select="concat($component-prefix,$component-label)" />
	</xsl:template>
	
	<!-- Remove space, tab, line feed, and carriage return from text -->
	
	<xsl:template name="remove-whitespace">
		<xsl:param name="text"/>
		<xsl:value-of select="translate($text,' &#9;&#10;&#13;','')"/>
	</xsl:template>

	<!-- 
		
		Property definition.
		
		Transform:
		
		<propdef comp="Interface Operation">message exchange pattern</propdef>
		
		to:
		
		{<a name="property-InterfaceOperation.messageexchangepattern">message exchange pattern</a>}
		
	-->

	<xsl:template match="propdef">
		<xsl:variable name="anchor">
			<xsl:call-template name="property-anchor">
				<xsl:with-param name="component" select="@comp" />
				<xsl:with-param name="property" select="." />
			</xsl:call-template>
		</xsl:variable>
		<xsl:text>{</xsl:text>
		<a name="{$anchor}">
			<xsl:value-of select="." />
		</a>
		<xsl:text>}</xsl:text>
	</xsl:template>

	<!-- 
		
		Property reference.
		
		Transform:
		
		<prop comp="Interface Operation">message exchange pattern</propdef>
		
		to:
		
		{<a href="#property-InterfaceOperation.messageexchangepattern">message exchange pattern</a>}
		
	-->

	<xsl:template match="prop">
		<xsl:variable name="anchor">
			<xsl:call-template name="property-anchor">
				<xsl:with-param name="component" select="@comp" />
				<xsl:with-param name="property" select="." />
			</xsl:call-template>
		</xsl:variable>
		<xsl:text>{</xsl:text>
		<a href="#{$anchor}">
			<xsl:value-of select="." />
		</a>
		<xsl:text>}</xsl:text>
	</xsl:template>

	<xsl:template name="property-anchor">
		<xsl:param name="component" />
		<xsl:param name="property" />
		<xsl:variable name="property-label">
			<xsl:call-template name="remove-whitespace">
				<xsl:with-param name="text" select="concat($component,'.',$property)" />
			</xsl:call-template>
		</xsl:variable>
		<xsl:value-of select="concat($property-prefix,$property-label)" />
	</xsl:template>
		
</xsl:stylesheet>
Index: xmlspec.dtd
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/xmlspec.dtd,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** xmlspec.dtd	23 May 2005 00:53:22 -0000	1.11
--- xmlspec.dtd	8 Jun 2005 21:12:35 -0000	1.12
***************
*** 127,132 ****
  <!ENTITY % annot.class          "footnote
                                  %local.annot.class;">
  
! <!ENTITY % local.termdef.class  "">
  <!ENTITY % termdef.class        "termdef|term
                                  %local.termdef.class;">
--- 127,138 ----
  <!ENTITY % annot.class          "footnote
                                  %local.annot.class;">
+                                 
+ <!--
+ #2005-06-08: ryman: Created %wsdldef.class and added it to %local.termdef.class
+ -->
  
! <!ENTITY % wsdldef.class		"compdef|comp|propdef|prop">                                
! 
! <!ENTITY % local.termdef.class  "|%wsdldef.class;">
  <!ENTITY % termdef.class        "termdef|term
                                  %local.termdef.class;">
***************
*** 2654,2658 ****
  <!-- 
  
! 	Additions to XML specification DTD for Z Notation
  
  	Maintainers:
--- 2660,2664 ----
  <!-- 
  
! 	Additions to XML specification DTD for Z Notation and WSDL
  
  	Maintainers:
***************
*** 2663,2666 ****
--- 2669,2675 ----
  	Change Log:
  	
+ 	2005-06-08 ryman
+ 	- added markup for components and properties: compdef, comp, propdef, prop
+ 	
  	2005-05-22 ryman
  	- changed content model to EMPTY on several Z Notation elements
***************
*** 2673,2676 ****
--- 2682,2695 ----
  	
  -->
+ 
+ <!ELEMENT compdef (#PCDATA)>
+ 
+ <!ELEMENT comp (#PCDATA)>
+ 
+ <!ELEMENT propdef (#PCDATA)>
+ <!ATTLIST propdef comp CDATA #IMPLIED>
+ 
+ <!ELEMENT prop (#PCDATA)>
+ <!ATTLIST prop comp CDATA #IMPLIED>
  	
  <!ELEMENT z:math ANY>

Index: wsdl20.html
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20.html,v
retrieving revision 1.193
retrieving revision 1.194
diff -C2 -d -r1.193 -r1.194
*** wsdl20.html	7 Jun 2005 10:01:17 -0000	1.193
--- wsdl20.html	8 Jun 2005 21:12:33 -0000	1.194
***************
*** 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 12 April 2005), 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 1:
! Core Language</title>
[...19427 lines suppressed...]
!     <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>
\ No newline at end of file

Received on Wednesday, 8 June 2005 21:12:50 UTC