- From: Jean-Jacques Moreau via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 20 May 2005 08:00:23 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/wsdl20
In directory hutz:/tmp/cvs-serv26578
Modified Files:
wsdl20-adjuncts.xml
Log Message:
LC97: Fixed specifying default values throughout the spec.
Resolved incoherenciees along the way.
Also fixed merging conflict.
Also fixed validating problem.
Index: wsdl20-adjuncts.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20-adjuncts.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** wsdl20-adjuncts.xml 19 May 2005 19:00:53 -0000 1.48
--- wsdl20-adjuncts.xml 20 May 2005 08:00:21 -0000 1.49
***************
*** 273,280 ****
<p>[enumeration, specifying, for each message] A[n optional] message:</p>
<olist>
! <item>indicated by a Message Label component whose {message label} is
! '[label]' and direction is '[direction]'</item>
! <item>[received from|sent to] ['some' if first mention] node [node
! identifier]</item>
</olist>
--- 273,280 ----
<p>[enumeration, specifying, for each message] A[n optional] message:</p>
<olist>
! <item><p>indicated by a Message Label 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>
</olist>
***************
*** 284,289 ****
property with the value '[pattern URI]'.</p>
- </div3>
-
<p>Note: In the template, the bracketed items indicate a replacement operation.
Substitute the correct terms for each bracketed item.</p>
--- 284,287 ----
***************
*** 294,297 ****
--- 292,297 ----
messages in the exchange.</p>
+ </div3>
+
</div2>
***************
*** 1930,1934 ****
<td rowspan="1" colspan="1">{required}</td>
<td rowspan="1" colspan="1">The actual value of the <att>required</att>
! &AII; if present, otherwise false.</td>
</tr>
</tbody>
--- 1930,1934 ----
<td rowspan="1" colspan="1">{required}</td>
<td rowspan="1" colspan="1">The actual value of the <att>required</att>
! &AII; if present, otherwise <attval>false</attval>.</td>
</tr>
</tbody>
***************
*** 2134,2138 ****
<td rowspan="1" colspan="1">{mustUnderstand}</td>
<td rowspan="1" colspan="1">The actual value of the <att>mustUnderstand</att>
! &AII; if present, otherwise false.</td>
</tr>
</tbody>
--- 2134,2138 ----
<td rowspan="1" colspan="1">{mustUnderstand}</td>
<td rowspan="1" colspan="1">The actual value of the <att>mustUnderstand</att>
! &AII; if present, otherwise <attval>false</attval>.</td>
</tr>
</tbody>
***************
*** 2199,2203 ****
Operation component's
&interface_operation-message_exchange_pattern-p; property
! has the value <attval>&wsdl-mep-in-out;</attval> then the
default value of the {soap mep} property for the
corresponding Binding Operation component is
--- 2199,2203 ----
Operation component's
&interface_operation-message_exchange_pattern-p; property
! has the value <attval>&wsdl-mep-in-out;</attval>, then the
default value of the {soap mep} property for the
corresponding Binding Operation component is
***************
*** 2667,2680 ****
</p>
</item>
! <item>
! <p>A type of <emph>xs:string</emph> whose pattern facet
! value is
! <emph><attval>[0-9]+\.[0-9]+</attval></emph></p>
! </item>
! <item>
! <p>
! A default value of <emph><attval>1.1</attval></emph>
! </p>
! </item>
</ulist>
</div3>
--- 2667,2674 ----
</p>
</item>
! <item>
! <p>A type of <emph>xs:string</emph> whose pattern facet is
! <emph><attval>[0-9]+\.[0-9]+</attval></emph>.</p>
! </item>
</ulist>
</div3>
***************
*** 2696,2700 ****
<td rowspan="1" colspan="1">{http version}</td>
<td rowspan="1" colspan="1">The actual value of the <att>whttp:version</att>
! &AII;.</td>
</tr>
</tbody>
--- 2690,2694 ----
<td rowspan="1" colspan="1">{http version}</td>
<td rowspan="1" colspan="1">The actual value of the <att>whttp:version</att>
! &AII;, if present, otherwise <attval>1.1</attval>.</td>
</tr>
</tbody>
***************
*** 2753,2762 ****
<p>A type of <emph>xs:string</emph></p>
</item>
- <item>
- <p>
- No default value
- </p>
- </item>
</ulist>
</div3>
--- 2747,2753 ----
<p>A type of <emph>xs:string</emph></p>
</item>
</ulist>
+ <p>The <att>methodDefault</att> &AII; does NOT
+ have a default value.</p>
</div3>
***************
*** 2845,2849 ****
<p>{http query parameter separator} REQUIRED. A
<emph>xs:string</emph> indicating the query parameter
! separator character. Its default value is <attval>&</attval>.</p>
</item>
</ulist>
--- 2836,2840 ----
<p>{http query parameter separator} REQUIRED. A
<emph>xs:string</emph> indicating the query parameter
! separator character.</p>
</item>
</ulist>
***************
*** 2883,2889 ****
<p>A type of <emph>xs:anyURI</emph></p>
</item>
- <item>
- <p>No default value</p>
- </item>
</ulist>
</item>
--- 2874,2877 ----
***************
*** 2904,2910 ****
<p>A type of <emph>xs:string</emph></p>
</item>
- <item>
- <p>No default value</p>
- </item>
</ulist>
</item>
--- 2892,2895 ----
***************
*** 2925,2931 ****
<p>A type of <emph>xs:string</emph></p>
</item>
- <item>
- <p>No default value</p>
- </item>
</ulist>
</item>
--- 2910,2913 ----
***************
*** 2946,2952 ****
<p>A type of <emph>xs:string</emph></p>
</item>
- <item>
- <p>No default value</p>
- </item>
</ulist>
</item>
--- 2928,2931 ----
***************
*** 2967,2971 ****
<p>A type of <emph>xs:string</emph></p>
</item>
- <item><p>A default value of <emph><attval>application/xml</attval></emph></p></item>
</ulist>
</item>
--- 2946,2949 ----
***************
*** 3023,3040 ****
<td rowspan="1" colspan="1">The actual value of the
<att>whttp:location</att>
! &AII;, if present. Otherwise empty.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">{http method}</td>
<td rowspan="1" colspan="1">The actual value of the
! <att>whttp:method</att> &AII;, if present. Otherwise, the
actual value of the <att>whttp:methodDefault</att>
! &AII; as defined in <specref ref="http-default-method-decl"/>.
! Otherwise, error.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">{http input serialization}</td>
<td rowspan="1" colspan="1">The actual value of the <att>whttp:inputSerialization</att>
! &AII;, if present. Otherwise, the default value as
defined in <specref ref="_http_binding_default_rules"/>, computed based on the
value of the {http method} property.</td>
--- 3001,3018 ----
<td rowspan="1" colspan="1">The actual value of the
<att>whttp:location</att>
! &AII;, if present; otherwise empty.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">{http method}</td>
<td rowspan="1" colspan="1">The actual value of the
! <att>whttp:method</att> &AII;, if present; otherwise, the
actual value of the <att>whttp:methodDefault</att>
! &AII;, as defined in <specref ref="http-default-method-decl"/>;
! otherwise, it is an error.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">{http input serialization}</td>
<td rowspan="1" colspan="1">The actual value of the <att>whttp:inputSerialization</att>
! &AII;, if present; otherwise, the default value as
defined in <specref ref="_http_binding_default_rules"/>, computed based on the
value of the {http method} property.</td>
***************
*** 3043,3047 ****
<td rowspan="1" colspan="1">{http output serialization}</td>
<td rowspan="1" colspan="1">The actual value of the <att>whttp:outputSerialization</att>
! &AII;, if present. Otherwise, the default value as
defined in <specref ref="_http_binding_default_rules"/>, computed based on the
value of the {http method} property.</td>
--- 3021,3025 ----
<td rowspan="1" colspan="1">{http output serialization}</td>
<td rowspan="1" colspan="1">The actual value of the <att>whttp:outputSerialization</att>
! &AII;, if present; otherwise, the default value as
defined in <specref ref="_http_binding_default_rules"/>, computed based on the
value of the {http method} property.</td>
***************
*** 3050,3061 ****
<td rowspan="1" colspan="1">{http fault serialization}</td>
<td rowspan="1" colspan="1">The actual value of the <att>whttp:faultSerialization</att>
! &AII;.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">{http query parameter separator}</td>
<td rowspan="1" colspan="1">The actual value of the
! <att>whttp:queryParameterSeparator</att> &AII;, if present. Otherwise, the
actual value of the <att>whttp:queryParameterSeparatorDefault</att>
! &AII;, if present. Otherwise, <attval>&</attval>.</td>
</tr>
</tbody>
--- 3028,3039 ----
<td rowspan="1" colspan="1">{http fault serialization}</td>
<td rowspan="1" colspan="1">The actual value of the <att>whttp:faultSerialization</att>
! &AII;, if present; otherwise <emph><attval>application/xml</attval></emph>.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">{http query parameter separator}</td>
<td rowspan="1" colspan="1">The actual value of the
! <att>whttp:queryParameterSeparator</att> &AII;, if present; otherwise, the
actual value of the <att>whttp:queryParameterSeparatorDefault</att>
! &AII;, if present; otherwise, <attval>&</attval>.</td>
</tr>
</tbody>
***************
*** 3804,3810 ****
<p>A type of <emph>xs:string</emph></p>
</item>
- <item>
- <p>No default value</p>
- </item>
</ulist>
--- 3782,3785 ----
***************
*** 3825,3831 ****
<p>A type of <emph>xs:string</emph></p>
</item>
- <item>
- <p>No default value</p>
- </item>
</ulist>
</div3>
--- 3800,3803 ----
***************
*** 3849,3855 ****
<att>whttp:transferCoding</att> &AII; on the Binding
Message Reference or Binding Fault Reference component,
! if present. If not, the actual value of the
<att>whttp:transferCodingDefault</att> on the Binding
! Operation component, if present. If not, the actual
value of the <att>whttp:transferCodingDefault</att> on
the Binding component, if present.</td>
--- 3821,3827 ----
<att>whttp:transferCoding</att> &AII; on the Binding
Message Reference or Binding Fault Reference component,
! if present; otherwise, the actual value of the
<att>whttp:transferCodingDefault</att> on the Binding
! Operation component, if present; otherwise, the actual
value of the <att>whttp:transferCodingDefault</att> on
the Binding component, if present.</td>
***************
*** 3915,3919 ****
<p>A type of <emph>xs:boolean</emph></p>
</item>
- <item><p>A default value of <emph>false</emph></p></item>
</ulist>
</div3>
--- 3887,3890 ----
***************
*** 3935,3939 ****
<td rowspan="1" colspan="1">{http cookies}</td>
<td rowspan="1" colspan="1">The actual value of the <att>whttp:cookies</att>
! &AII;.</td>
</tr>
</tbody>
--- 3906,3910 ----
<td rowspan="1" colspan="1">{http cookies}</td>
<td rowspan="1" colspan="1">The actual value of the <att>whttp:cookies</att>
! &AII;; otherwise, <attval>false</attval>.</td>
</tr>
</tbody>
***************
*** 4020,4028 ****
<p>A type of <emph>xs:string</emph></p>
</item>
- <item><p>A default value of <emph>"none"</emph></p></item>
</ulist>
</item>
<item>
! <p>An OPTIONAL <att>authenticationType</att> &AII; with
the following Infoset properties:</p>
<ulist>
--- 3991,3998 ----
<p>A type of <emph>xs:string</emph></p>
</item>
</ulist>
</item>
<item>
! <p>An OPTIONAL <att>authenticationRealm</att> &AII; with
the following Infoset properties:</p>
<ulist>
***************
*** 4038,4042 ****
<p>A type of <emph>xs:string</emph></p>
</item>
- <item><p>A default value of <emph>""</emph></p></item>
</ulist>
</item>
--- 4008,4011 ----
***************
*** 4060,4069 ****
<td rowspan="1" colspan="1">{http authentication scheme}</td>
<td rowspan="1" colspan="1">The actual value of the <att>whttp:authenticationType</att>
! &AII;.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">{http authentication realm}</td>
<td rowspan="1" colspan="1">The actual value of the <att>whttp:authenticationRealm</att>
! &AII;.</td>
</tr>
</tbody>
--- 4029,4038 ----
<td rowspan="1" colspan="1">{http authentication scheme}</td>
<td rowspan="1" colspan="1">The actual value of the <att>whttp:authenticationType</att>
! &AII;; otherwise, <attval>none</attval>.</td>
</tr>
<tr>
<td rowspan="1" colspan="1">{http authentication realm}</td>
<td rowspan="1" colspan="1">The actual value of the <att>whttp:authenticationRealm</att>
! &AII;; otherwise, <attval></attval>.</td>
</tr>
</tbody>
***************
*** 4317,4321 ****
</tr>
-->
! <tr>
<td>20050519</td>
<td>aal</td>
--- 4286,4296 ----
</tr>
-->
! <tr>
! <td>20050520</td>
! <td>JJM</td>
! <td><loc href='http://www.w3.org/2002/ws/desc/4/lc-issues/issues.html#LC97'>LC97</loc>:
! Fixed specifying default values throughout the spec. Resolved incoherenciees along the way.</td>
! </tr>
! <tr>
<td>20050519</td>
<td>aal</td>
***************
*** 4323,4327 ****
patterns.</td>
</tr>
! <tr>
<td>20050512</td>
<td>HH</td>
--- 4298,4302 ----
patterns.</td>
</tr>
! <tr>
<td>20050512</td>
<td>HH</td>
Received on Friday, 20 May 2005 08:00:27 UTC