- From: Jean-Jacques Moreau via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 14 Jun 2005 15:50:54 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/wsdl20
In directory hutz:/tmp/cvs-serv5289/ws/desc/wsdl20
Modified Files:
wsdl20-adjuncts.xml
Log Message:
Further pass at adding markup for properties. Fixed issues with entities preventing validation.
Index: wsdl20-adjuncts.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20-adjuncts.xml,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** wsdl20-adjuncts.xml 14 Jun 2005 13:46:02 -0000 1.63
--- wsdl20-adjuncts.xml 14 Jun 2005 15:50:52 -0000 1.64
***************
*** 285,290 ****
<p>[enumeration, specifying, for each message] A[n optional] message:</p>
<olist>
! <item><p>indicated by a <comp>Message Label</comp> component whose {message label} is
! '[label]' and direction is '[direction]'</p></item>
<item><p>[received from|sent to] ['some' if first mention] node [node
identifier]</p></item>
--- 285,291 ----
<p>[enumeration, specifying, for each message] A[n optional] message:</p>
<olist>
! <item><p>indicated by a <comp>Message Label</comp> component whose
! <prop comp="Message Label">message label</prop> is
! <attval>[label]</attval> and direction is <attval>[direction]</attval></p></item>
<item><p>[received from|sent to] ['some' if first mention] node [node
identifier]</p></item>
***************
*** 293,297 ****
<p>This pattern uses the rule [fault ruleset reference].</p>
! <p>An operation using this message exchange pattern has a <prop comp="Operation">pattern</prop>
property with the value <attval>[pattern IRI]</attval>.</p>
--- 294,298 ----
<p>This pattern uses the rule [fault ruleset reference].</p>
! <p>An operation using this message exchange pattern has a <prop comp="Interface Operation">pattern</prop>
property with the value <attval>[pattern IRI]</attval>.</p>
***************
*** 402,406 ****
<p>This pattern uses the rule <specref ref='no-fault'/>.</p>
<p>
! An operation using this message exchange pattern has a <prop comp="Operation">pattern</prop> property with
the value <attval>&wsdl-mep-in-only;</attval>.
</p>
--- 403,407 ----
<p>This pattern uses the rule <specref ref='no-fault'/>.</p>
<p>
! An operation using this message exchange pattern has a <prop comp="Interface Operation">pattern</prop> property with
the value <attval>&wsdl-mep-in-only;</attval>.
</p>
***************
*** 421,425 ****
</olist>
<p>This pattern uses the rule <specref ref='fault-trigger'/>.</p>
! <p>An operation using this message exchange pattern has a <prop comp="Operation">pattern</prop> property with
the value <attval>&wsdl-mep-robust-in-only;</attval>.</p>
</div3>
--- 422,426 ----
</olist>
<p>This pattern uses the rule <specref ref='fault-trigger'/>.</p>
! <p>An operation using this message exchange pattern has a <prop comp="Interface Operation">pattern</prop> property with
the value <attval>&wsdl-mep-robust-in-only;</attval>.</p>
</div3>
***************
*** 496,500 ****
</olist>
<p>This pattern uses the rule <specref ref='fault-trigger'/>.</p>
! <p>An operation using this message exchange pattern has a {pattern} property
with the value <attval>&wsdl-mep-in-opt-out;</attval>.</p>
</div3>
--- 497,501 ----
</olist>
<p>This pattern uses the rule <specref ref='fault-trigger'/>.</p>
! <p>An operation using this message exchange pattern has a <prop comp="Interface Operation">pattern</prop> property
with the value <attval>&wsdl-mep-in-opt-out;</attval>.</p>
</div3>
***************
*** 525,529 ****
<p>This pattern uses the rule <specref ref='no-fault'/>.</p>
<p>
! An operation using this message exchange pattern has a {pattern} property with
the value <attval>&wsdl-mep-out-only;</attval>.
</p>
--- 526,530 ----
<p>This pattern uses the rule <specref ref='no-fault'/>.</p>
<p>
! An operation using this message exchange pattern has a <prop comp="Interface Operation">pattern</prop> property with
the value <attval>&wsdl-mep-out-only;</attval>.
</p>
***************
*** 544,548 ****
</olist>
<p>This pattern uses the rule <specref ref='fault-trigger'/>.</p>
! <p>An operation using this message exchange pattern has a {pattern} property with
the value <attval>&wsdl-mep-robust-out-only;</attval>.</p>
</div3>
--- 545,549 ----
</olist>
<p>This pattern uses the rule <specref ref='fault-trigger'/>.</p>
! <p>An operation using this message exchange pattern has a <prop comp="Interface Operation">pattern</prop> property with
the value <attval>&wsdl-mep-robust-out-only;</attval>.</p>
</div3>
***************
*** 591,595 ****
<p>This pattern uses the rule <specref ref='fault-replacement'/>.</p>
<p>
! An operation using this message exchange pattern has a {pattern} property with
the value <attval>&wsdl-mep-out-in;</attval>.
</p>
--- 592,596 ----
<p>This pattern uses the rule <specref ref='fault-replacement'/>.</p>
<p>
! An operation using this message exchange pattern has a <prop comp="Interface Operation">pattern</prop> property with
the value <attval>&wsdl-mep-out-in;</attval>.
</p>
***************
*** 619,623 ****
</olist>
<p>This pattern uses the rule <specref ref='fault-trigger'/>.</p>
! <p>An operation using this message exchange pattern has a {pattern} property with
the value <attval>&wsdl-mep-out-opt-in;</attval>.</p>
</div3>
--- 620,624 ----
</olist>
<p>This pattern uses the rule <specref ref='fault-trigger'/>.</p>
! <p>An operation using this message exchange pattern has a <prop comp="Interface Operation">pattern</prop> property with
the value <attval>&wsdl-mep-out-opt-in;</attval>.</p>
</div3>
***************
*** 716,720 ****
</tr>
<tr>
! <td>{safety}</td>
<td>
The actual value of the <att>safe</att> &AII;, if
--- 717,721 ----
</tr>
<tr>
! <td><prop comp="Interface Operation">safety</prop></td>
<td>
The actual value of the <att>safe</att> &AII;, if
***************
*** 747,751 ****
<p>The RPC style is selected by assigning to an <comp>Interface
! Operation</comp> component's <prop comp="Interface Operation">&interface_operation-style-p;</prop>
property the value <attval>&RPC-STYLE;</attval>.</p>
--- 748,752 ----
<p>The RPC style is selected by assigning to an <comp>Interface
! Operation</comp> component's <prop comp="Interface Operation">style</prop>
property the value <attval>&RPC-STYLE;</attval>.</p>
***************
*** 759,763 ****
<p>The RPC style MUST NOT be used for <comp>Interface Operation</comp>
! components whose <prop comp="Interface Operation">&interface_operation-message_exchange_pattern-p;</prop>
property has a value other than <attval>&wsdl-ns;/in-only</attval> or <attval>&wsdl-ns;/in-out</attval>.</p>
--- 760,764 ----
<p>The RPC style MUST NOT be used for <comp>Interface Operation</comp>
! components whose <prop comp="Interface Operation">message exchange pattern</prop>
property has a value other than <attval>&wsdl-ns;/in-only</attval> or <attval>&wsdl-ns;/in-out</attval>.</p>
***************
*** 1010,1014 ****
<p>
The IRI style is selected by assigning the <comp>Interface
! Operation</comp> component's <prop comp="Interface Operation">&interface_operation-style-p;</prop> property the value
<attval>&IRI-STYLE;</attval>.
</p>
--- 1011,1015 ----
<p>
The IRI style is selected by assigning the <comp>Interface
! Operation</comp> component's <prop comp="Interface Operation">style</prop> property the value
<attval>&IRI-STYLE;</attval>.
</p>
***************
*** 1016,1020 ****
Use of this value indicates that XML Schema <bibref
ref="XMLSchemaP1"/> was used to define the schema of the
! <prop comp="Interface Message Reference">&interface_message_reference-element-p;</prop>
property of the <comp>Interface Message
Reference</comp> component of the <comp>Interface Operation</comp> component
--- 1017,1021 ----
Use of this value indicates that XML Schema <bibref
ref="XMLSchemaP1"/> was used to define the schema of the
! <prop comp="Interface Message Reference">element</prop>
property of the <comp>Interface Message
Reference</comp> component of the <comp>Interface Operation</comp> component
***************
*** 1085,1089 ****
<p>
The Multipart style is selected by assigning the <comp>Interface
! Operation</comp> component's <prop comp="Interface Operation">&interface_operation-style-p;</prop> property the value
<attval>&MULTIPART-STYLE;</attval>.
</p>
--- 1086,1090 ----
<p>
The Multipart style is selected by assigning the <comp>Interface
! Operation</comp> component's <prop comp="Interface Operation">style</prop> property the value
<attval>&MULTIPART-STYLE;</attval>.
</p>
***************
*** 1091,1095 ****
Use of this value indicates that XML Schema <bibref
ref="XMLSchemaP1"/> was used to define the schema of the
! <prop comp="Interface Message Reference">&interface_message_reference-element-p;</prop>
property of the <comp>Interface Message
Reference</comp> component of the <comp>Interface Operation</comp> component
--- 1092,1096 ----
Use of this value indicates that XML Schema <bibref
ref="XMLSchemaP1"/> was used to define the schema of the
! <prop comp="Interface Message Reference">element</prop>
property of the <comp>Interface Message
Reference</comp> component of the <comp>Interface Operation</comp> component
***************
*** 1203,1218 ****
<ulist>
! <item><p>{http version} as defined in <specref
ref="http-version-decl"/></p></item>
! <item><p>{http location} as defined in <specref
ref="http-operation-decl"/></p></item>
! <item><p>{http headers} as defined in <specref
ref="http-headers-decl"/></p></item>
! <item><p>{http transfer coding} as defined in <specref
ref="http-transfer-coding-decl"/></p></item>
! <item><p>{http cookies} as defined in <specref
ref="http-cookies-decl"/></p></item>
! <item><p>{http authentication scheme} and {http authentication
! realm} as defined in <specref
ref="http-auth-decl"/></p></item>
</ulist>
--- 1204,1219 ----
<ulist>
! <item><p><prop comp="Binding Message Reference">http version</prop> as defined in <specref
ref="http-version-decl"/></p></item>
! <item><p><prop comp="Binding Message Reference">http location</prop> as defined in <specref
ref="http-operation-decl"/></p></item>
! <item><p><prop comp="Binding Message Reference">http headers</prop> as defined in <specref
ref="http-headers-decl"/></p></item>
! <item><p><prop comp="Binding Message Reference">http transfer coding</prop> as defined in <specref
ref="http-transfer-coding-decl"/></p></item>
! <item><p><prop comp="Binding Message Reference">http cookies</prop> as defined in <specref
ref="http-cookies-decl"/></p></item>
! <item><p><prop comp="Binding Message Reference">http authentication scheme</prop> and
! <prop comp="Binding Message Reference">http authentication realm</prop> as defined in <specref
ref="http-auth-decl"/></p></item>
</ulist>
***************
*** 1333,1337 ****
<p>A <comp>Binding</comp> component (defined in <bibref ref="WSDL-PART1"/>)
is identified as a SOAP binding by assigning the value
! <attval>&wsdl-soap-ns;</attval> to the <prop comp="Binding">&binding-type-p;</prop> property of
the <comp>Binding</comp> component.</p>
</div2>
--- 1334,1338 ----
<p>A <comp>Binding</comp> component (defined in <bibref ref="WSDL-PART1"/>)
is identified as a SOAP binding by assigning the value
! <attval>&wsdl-soap-ns;</attval> to the <prop comp="Binding">type</prop> property of
the <comp>Binding</comp> component.</p>
</div2>
***************
*** 1355,1359 ****
<ulist>
<item><p>If the value of the
! <prop comp="Interface Message Reference">&interface_message_reference-message_content_model-p;</prop>
property of the <comp>Interface Message Reference</comp> component is <attval>#any</attval> then
the payload MAY be any one XML element.</p></item>
--- 1356,1360 ----
<ulist>
<item><p>If the value of the
! <prop comp="Interface Message Reference">message content model</prop>
property of the <comp>Interface Message Reference</comp> component is <attval>#any</attval> then
the payload MAY be any one XML element.</p></item>
***************
*** 1364,1368 ****
<item><p>If the value is <attval>#element</attval> then the
payload will be the &EII; identified by the
! <prop comp="Interface Message Reference">&interface_message_reference-element-p;</prop>
property of the <comp>Interface Message Reference</comp> component.</p></item>
--- 1365,1369 ----
<item><p>If the value is <attval>#element</attval> then the
payload will be the &EII; identified by the
! <prop comp="Interface Message Reference">element</prop>
property of the <comp>Interface Message Reference</comp> component.</p></item>
***************
*** 2159,2163 ****
A <emph>xs:QName</emph>, a
reference to an XML element declaration in the
! <prop comp="Description">&description-element_declarations-p;</prop> property of the
<comp>Description</comp> component. This element represents a SOAP
header block.</p>
--- 2160,2164 ----
A <emph>xs:QName</emph>, 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 a SOAP
header block.</p>
***************
*** 2297,2306 ****
<td rowspan="1" colspan="1"><prop comp="SOAP Header Block">element</prop></td>
<td rowspan="1" colspan="1">The element declaration
! from the <prop comp="Description">&description-element_declarations-p;</prop> resolved
to by the value of the <att>element</att> &AII;. It is
an error for the <att>element</att> &AII; to have a
value and that value does not resolve to a global
element declaration from the
! <prop comp="Description">&description-element_declarations-p;</prop> property of the
<comp>Description</comp> component.</td>
</tr>
--- 2298,2307 ----
<td rowspan="1" colspan="1"><prop comp="SOAP Header Block">element</prop></td>
<td rowspan="1" colspan="1">The element declaration
! from the <prop comp="Description">element declarations</prop> resolved
to by the value of the <att>element</att> &AII;. It is
an error for the <att>element</att> &AII; to have a
value and that value does not resolve to a global
element declaration from the
! <prop comp="Description">element declarations</prop> property of the
<comp>Description</comp> component.</td>
</tr>
***************
*** 2399,2403 ****
defined in <specref ref="http-operation-decl"/>. When such a
location is specified, the <comp>Endpoint</comp> component also follows the
! rules for constructing the address from the <prop comp="Endpoint">&endpoint-address-p;</prop>
property and the <prop comp="Endpoint">http location</prop> property values.</p>
<p></p>
--- 2400,2404 ----
defined in <specref ref="http-operation-decl"/>. When such a
location is specified, the <comp>Endpoint</comp> component also follows the
! rules for constructing the address from the <prop comp="Endpoint">address</prop>
property and the <prop comp="Endpoint">http location</prop> property values.</p>
<p></p>
***************
*** 2420,2424 ****
<item><p><emph>SOAP MEP Selection.</emph> If the <comp>Interface
Operation</comp> component's
! <prop comp="Interface Operation">&interface_operation-message_exchange_pattern-p;</prop> property
has the value <attval>&wsdl-mep-in-out;</attval>, then the
default value of the <prop comp="Binding Operation">soap mep</prop> property for the
--- 2421,2425 ----
<item><p><emph>SOAP MEP Selection.</emph> If the <comp>Interface
Operation</comp> component's
! <prop comp="Interface Operation">message exchange pattern</prop> property
has the value <attval>&wsdl-mep-in-out;</attval>, then the
default value of the <prop comp="Binding Operation">soap mep</prop> property for the
***************
*** 2428,2432 ****
Pattern as defined in <bibref ref="SOAP12-PART2"/>. If the
<comp>Interface Operation</comp> component has any other value for the
! <prop comp="Interface Operation">&interface_operation-message_exchange_pattern-p;</prop> property,
then no default value is defined for the <prop comp="Binding Operation">soap mep</prop> property
of the corresponding <comp>Binding Operation</comp> component.</p>
--- 2429,2433 ----
Pattern as defined in <bibref ref="SOAP12-PART2"/>. If the
<comp>Interface Operation</comp> component has any other value for the
! <prop comp="Interface Operation">message exchange pattern</prop> property,
then no default value is defined for the <prop comp="Binding Operation">soap mep</prop> property
of the corresponding <comp>Binding Operation</comp> component.</p>
***************
*** 2455,2459 ****
Operation</comp> component has the value
<attval>&soap12-soap-response-mep-uri;</attval>
! then the default value of the {http method} property is
<attval>GET</attval>.</p></item>
--- 2456,2460 ----
Operation</comp> component has the value
<attval>&soap12-soap-response-mep-uri;</attval>
! then the default value of the <prop comp="Binding Operation">http method</prop> property is
<attval>GET</attval>.</p></item>
***************
*** 2550,2557 ****
called an <term>instance data</term>, and is constrained by
the schema definition associated the message: the XML element
! referenced in the <prop comp="Inteface Message Reference">&interface_message_reference-element-p;</prop>
! property of the <comp>Interface Message Reference component</comp> for input and output messages,
! and in the <prop comp="Interface Fault">&interface_fault-element-p;</prop> property of an
! <comp>Interface Fault</comp> component for faults.</termdef>
</p>
--- 2551,2563 ----
called an <term>instance data</term>, and is constrained by
the schema definition associated the message: the XML element
! referenced in the
! <!-- <prop comp="Inteface Message Reference"> -->message reference element<!-- </prop> -->
! property of the
! <!-- <comp> -->Interface Message Reference<!-- </comp> -->
! component for input and output messages, and in the
! <!-- <prop comp="Interface Fault"> -->element<!-- </prop> -->
! property of an
! <!-- <comp> -->Interface Fault<!-- </comp> -->
! component for faults.</termdef>
</p>
***************
*** 2561,2565 ****
<p>A <comp>Binding</comp> component (defined in <bibref ref="WSDL-PART1"/>)
is identified as an HTTP binding by assigning the value
! <attval>&wsdl-http-ns;</attval> to the <prop comp="Binding">&binding-type-p;</prop> property of
the <comp>Binding</comp> component.</p>
</div2>
--- 2567,2571 ----
<p>A <comp>Binding</comp> component (defined in <bibref ref="WSDL-PART1"/>)
is identified as an HTTP binding by assigning the value
! <attval>&wsdl-http-ns;</attval> to the <prop comp="Binding">type</prop> property of
the <comp>Binding</comp> component.</p>
</div2>
***************
*** 2669,2680 ****
<ulist>
<item><p><comp>Interface Message Reference</comp> component: if the value of the
! <prop comp="Interface Message Reference">&interface_message_reference-message_content_model-p;</prop> property is
<attval>#any</attval> then the payload MAY be any one XML
element. If the value is <attval>#none</attval> then the payload
MUST be empty. Finally if the value is <attval>#element</attval>
then the payload will be the &EII; identified by the
! <prop comp="Interface Message Reference">&interface_message_reference-element-p;</prop> property.</p></item>
<item><p><comp>Interface Fault</comp> component: the payload will be the
! &EII; identified by the <prop comp="Interface Fault">&interface_fault-element-p;</prop>
property.</p></item>
</ulist>
--- 2675,2686 ----
<ulist>
<item><p><comp>Interface Message Reference</comp> component: if the value of the
! <prop comp="Interface Message Reference">message content model</prop> property is
<attval>#any</attval> then the payload MAY be any one XML
element. If the value is <attval>#none</attval> then the payload
MUST be empty. Finally if the value is <attval>#element</attval>
then the payload will be the &EII; identified by the
! <prop comp="Interface Message Reference">element</prop> property.</p></item>
<item><p><comp>Interface Fault</comp> component: the payload will be the
! &EII; identified by the <prop comp="Interface Fault">element</prop>
property.</p></item>
</ulist>
***************
*** 2767,2773 ****
ref="_http_x-www-form-urlencoded"/>).</p></note>
! <p>The default values for the {http input serialization} and
! {http output serialization} properties for any other value of
! the {http method} method is <code>application/xml</code>.</p>
<p>
--- 2773,2779 ----
ref="_http_x-www-form-urlencoded"/>).</p></note>
! <p>The default values for the <prop comp="Binding Operation">http input serialization</prop> and
! <prop comp="Binding Operation">http output serialization</prop> properties for any other value of
! the <prop comp="Binding Operation">http method</prop> method is <code>application/xml</code>.</p>
<p>
***************
*** 2998,3002 ****
<p>This binding extension specification provides a binding to HTTP of
<comp>Interface Operation</comp> components whose
! <prop comp="Interface Operation">&interface_operation-message_exchange_pattern-p;</prop> property
has the value <attval>&wsdl-mep-in-only;</attval>,
<attval>&wsdl-mep-robust-in-only;</attval> or <attval>&wsdl-mep-in-out;</attval>. This
--- 3004,3008 ----
<p>This binding extension specification provides a binding to HTTP of
<comp>Interface Operation</comp> components whose
! <prop comp="Interface Operation">message exchange pattern</prop> property
has the value <attval>&wsdl-mep-in-only;</attval>,
<attval>&wsdl-mep-robust-in-only;</attval> or <attval>&wsdl-mep-in-out;</attval>. This
***************
*** 3033,3039 ****
IRI, i.e. it MUST NOT include a fragment identifier in
the IRI. Input serializations may define additional
! processing rules to be applied to the value of {http
! location} before combining it with the
! <prop comp="Endpoint">&endpoint-address-p;</prop> property of the endpoint element to
form the HTTP request IRI. For example, the
<code>application/x-www-form-urlencoded</code> serialization defined
--- 3039,3045 ----
IRI, i.e. it MUST NOT include a fragment identifier in
the IRI. Input serializations may define additional
! processing rules to be applied to the value of
! <prop comp="Binding Operation">http location</prop> before combining it with the
! <prop comp="Endpoint">address</prop> property of the endpoint element to
form the HTTP request IRI. For example, the
<code>application/x-www-form-urlencoded</code> serialization defined
***************
*** 3311,3315 ****
A <emph>xs:QName</emph>, a
reference to an XML element declaration in the
! <prop comp="Description">&description-element_declarations-p;</prop> property of the
<comp>Description</comp> component. This element represents a HTTP
header.</p>
--- 3317,3321 ----
A <emph>xs:QName</emph>, 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 a HTTP
header.</p>
***************
*** 3427,3436 ****
<td rowspan="1" colspan="1"><prop comp="HTTP Header">element</prop></td>
<td rowspan="1" colspan="1">The element declaration
! from the <prop comp="Description">&description-element_declarations-p;</prop> resolved
to by the value of the <att>element</att> &AII;. It is
an error for the <att>element</att> &AII; to have a
value and that value does not resolve to a global
element declaration from the
! <prop comp="Description">&description-element_declarations-p;</prop> property of the
<comp>Description</comp> component.</td>
</tr>
--- 3433,3442 ----
<td rowspan="1" colspan="1"><prop comp="HTTP Header">element</prop></td>
<td rowspan="1" colspan="1">The element declaration
! from the <prop comp="Description">element declarations</prop> resolved
to by the value of the <att>element</att> &AII;. It is
an error for the <att>element</att> &AII; to have a
value and that value does not resolve to a global
element declaration from the
! <prop comp="Description">element declarations</prop> property of the
<comp>Description</comp> component.</td>
</tr>
***************
*** 3725,3729 ****
</div4>
<div4 id="_http_operation_location_notcited_get">
! <head>Case elements NOT cited in the <prop comp="Binding Operation">http location</prop> property</head>
<p>If not all elements from the <termref
def="instance_data">instance data</termref> are cited in
--- 3731,3735 ----
</div4>
<div4 id="_http_operation_location_notcited_get">
! <head>Case elements NOT cited in the {http location} property</head>
<p>If not all elements from the <termref
def="instance_data">instance data</termref> are cited in
***************
*** 4583,4586 ****
--- 4589,4598 ----
<td>20050614</td>
<td>JJM</td>
+ <td>Further pass at adding markup for properties. Fixed issues with entities preventing validation.
+ </td>
+ </tr>
+ <tr>
+ <td>20050614</td>
+ <td>JJM</td>
<td>Added <propdef> and <prop> markup around properties.
</td>
Received on Tuesday, 14 June 2005 15:51:04 UTC