- From: Anish.Karmarkar via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 10 Mar 2005 21:21:46 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/media-types
In directory hutz:/tmp/cvs-serv15028
Modified Files:
xml-media-types.xml xml-media-types.html
Log Message:
s/expectedContentType/expectedContentTypes
Index: xml-media-types.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/media-types/xml-media-types.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** xml-media-types.xml 10 Mar 2005 03:17:58 -0000 1.30
--- xml-media-types.xml 10 Mar 2005 21:21:43 -0000 1.31
***************
*** 110,114 ****
<p>
A XML Schema annotation attribute
! (<emph>xmime:expectedContentType</emph>) to indicate, in XML Schema, the
expected content-type(s) for an element content whose type is
<emph>xs:base64Binary</emph> or <emph>xs:hexBinary</emph>.
--- 110,114 ----
<p>
A XML Schema annotation attribute
! (<emph>xmime:expectedContentTypes</emph>) to indicate, in XML Schema, the
expected content-type(s) for an element content whose type is
<emph>xs:base64Binary</emph> or <emph>xs:hexBinary</emph>.
***************
*** 118,122 ****
<p>
! The XML Schema annotation, <emph>xmime:expectedContentType</emph>,
specifies the expected range of values for the
<emph>xmime:contentType</emph> attribute and the expected range of
--- 118,122 ----
<p>
! The XML Schema annotation, <emph>xmime:expectedContentTypes</emph>,
specifies the expected range of values for the
<emph>xmime:contentType</emph> attribute and the expected range of
***************
*** 276,295 ****
</div2>
! <div2 id="expectedContentType">
! <head>xmime:expectedContentType Attribute </head>
! <p> The <att>xmime:expectedContentType</att> &AII; has the following Infoset properties:
</p>
<ulist>
! <item><p>A [local name] of <el>expectedContentType</el>.</p></item>
<item><p>A [namespace name] of <el>&xmlmimens;</el>.</p></item>
</ulist>
! <p>The type of the <att>xmime:expectedContentType</att> &AII; is
<emph>xs:string</emph>.</p>
<p>The value and the meaning of the
! <att>xmime:expectedContentType</att> attribute is similar to the value
allowed for the <att>'Accept'</att> HTTP header defined by HTTP 1.1
specification, Section 14.1 (see <bibref ref="rfc2616"/>) and MUST
--- 276,295 ----
</div2>
! <div2 id="expectedContentTypes">
! <head>xmime:expectedContentTypes Attribute </head>
! <p> The <att>xmime:expectedContentTypes</att> &AII; has the following Infoset properties:
</p>
<ulist>
! <item><p>A [local name] of <el>expectedContentTypes</el>.</p></item>
<item><p>A [namespace name] of <el>&xmlmimens;</el>.</p></item>
</ulist>
! <p>The type of the <att>xmime:expectedContentTypes</att> &AII; is
<emph>xs:string</emph>.</p>
<p>The value and the meaning of the
! <att>xmime:expectedContentTypes</att> attribute is similar to the value
allowed for the <att>'Accept'</att> HTTP header defined by HTTP 1.1
specification, Section 14.1 (see <bibref ref="rfc2616"/>) and MUST
***************
*** 310,314 ****
</olist>
! <p>The <att>xmime:expectedContentType</att> &AII; is intended to be
used as part of XML Schema annotation for a &BEII; declaration
(see <specref ref="usage"/>). This &AII; is meant to allow
--- 310,314 ----
</olist>
! <p>The <att>xmime:expectedContentTypes</att> &AII; is intended to be
used as part of XML Schema annotation for a &BEII; declaration
(see <specref ref="usage"/>). This &AII; is meant to allow
***************
*** 381,387 ****
<div2 id="role">
! <head>Role of xmime:expectedContentType Schema Annotation Attribute</head>
! <p>The <att>xmime:expectedContentType</att> attribute is used for annotating
XML Schema to indicate the expected range of content-type of the binary
element content and the expected range of values for
--- 381,387 ----
<div2 id="role">
! <head>Role of xmime:expectedContentTypes Schema Annotation Attribute</head>
! <p>The <att>xmime:expectedContentTypes</att> attribute is used for annotating
XML Schema to indicate the expected range of content-type of the binary
element content and the expected range of values for
***************
*** 390,398 ****
<p>The value of the <att>xmime:contentType</att> attribute, if present, SHOULD
! be within the range specified by the <att>xmime:expectedContentType</att>
annotation attribute, if specified in the schema.
See Section 14.1 of <bibref ref="rfc2616"/> on how to interpret content-type
ranges that may be defined with respect to actual content. When the
! <att>xmime:expectedContentType</att> annotation attribute contains a wild card
("*") or a list of acceptable content-type separated by commas (","),
the schema SHOULD require
--- 390,398 ----
<p>The value of the <att>xmime:contentType</att> attribute, if present, SHOULD
! be within the range specified by the <att>xmime:expectedContentTypes</att>
annotation attribute, if specified in the schema.
See Section 14.1 of <bibref ref="rfc2616"/> on how to interpret content-type
ranges that may be defined with respect to actual content. When the
! <att>xmime:expectedContentTypes</att> annotation attribute contains a wild card
("*") or a list of acceptable content-type separated by commas (","),
the schema SHOULD require
***************
*** 403,411 ****
use the schema annotation to declare the range of expected
values.
! <att>xmime:expectedContentType</att> annotation attribute MAY be used in
conjunction with the declaration of &BEII;s or with complex type
definitions that are derived from <emph>xs:base64Binary</emph>
or <emph>xs:hexBinary</emph> in XML Schema. If the
! <att>xmime:expectedContentType</att> annotation attribute is used in
both the &BEII; declaration as well as definition of the complex type
which the &BEII; belongs to, then the expected range of values defined
--- 403,411 ----
use the schema annotation to declare the range of expected
values.
! <att>xmime:expectedContentTypes</att> annotation attribute MAY be used in
conjunction with the declaration of &BEII;s or with complex type
definitions that are derived from <emph>xs:base64Binary</emph>
or <emph>xs:hexBinary</emph> in XML Schema. If the
! <att>xmime:expectedContentTypes</att> annotation attribute is used in
both the &BEII; declaration as well as definition of the complex type
which the &BEII; belongs to, then the expected range of values defined
***************
*** 420,424 ****
and specifies the content-type of
the binary content. The schema annotation attribute
! <att>xmime:expectedContentType</att> specifies that the media type
of the binary content is 'image', and the subtype name is either 'jpeg'
or 'png'.
--- 420,424 ----
and specifies the content-type of
the binary content. The schema annotation attribute
! <att>xmime:expectedContentTypes</att> specifies that the media type
of the binary content is 'image', and the subtype name is either 'jpeg'
or 'png'.
***************
*** 449,453 ****
that the element definition will accept -->
<xs:element name="Picture" type="tns:PictureType"
! xmime:expectedContentType="image/jpeg, image/png"/>
</xs:schema>
--- 449,453 ----
that the element definition will accept -->
<xs:element name="Picture" type="tns:PictureType"
! xmime:expectedContentTypes="image/jpeg, image/png"/>
</xs:schema>
***************
*** 507,511 ****
<xs:complexType name="JPEGPictureType"
type="xs:base64Binary"
! xmime:expectedContentType="image/jpeg"/>
<xs:element name="JPEGPicture" type="tns:JPEGPictureType"/>
--- 507,511 ----
<xs:complexType name="JPEGPictureType"
type="xs:base64Binary"
! xmime:expectedContentTypes="image/jpeg"/>
<xs:element name="JPEGPicture" type="tns:JPEGPictureType"/>
***************
*** 536,540 ****
<xs:element name="JPEGPicture" type="xmime:base64Binary"
! xmime:expectedContentType="image/jpeg" />
</xs:schema>
--- 536,540 ----
<xs:element name="JPEGPicture" type="xmime:base64Binary"
! xmime:expectedContentTypes="image/jpeg" />
</xs:schema>
***************
*** 574,578 ****
<xs:element name="JPEGPeferredPicture"
type="tns:JPEGPreferredPictureType"
! xmime:expectedContentType="image/jpeg;q=1.0, image/tiff;q=0.8"/>
</xs:schema>
--- 574,578 ----
<xs:element name="JPEGPeferredPicture"
type="tns:JPEGPreferredPictureType"
! xmime:expectedContentTypes="image/jpeg;q=1.0, image/tiff;q=0.8"/>
</xs:schema>
***************
*** 734,744 ****
</xs:attribute>
<!--
! <xs:element name="expectedContentType" >
<xs:simpleType>
! <xs:list itemType="xmime:expectedContentType" />
</xs:simpleType>
</xs:element>
! <xs:simpleType name="expectedContentType" >
<xs:restriction base="xs:string" >
<xs:pattern value="(text|application|image|audio|video|model|x-[-.a-z0-9]+)/
--- 734,744 ----
</xs:attribute>
<!--
! <xs:element name="expectedContentTypes" >
<xs:simpleType>
! <xs:list itemType="xmime:expectedContentTypes" />
</xs:simpleType>
</xs:element>
! <xs:simpleType name="expectedContentTypes" >
<xs:restriction base="xs:string" >
<xs:pattern value="(text|application|image|audio|video|model|x-[-.a-z0-9]+)/
***************
*** 747,751 ****
</xs:simpleType>
-->
! <xs:attribute name="expectedContentType" type="xs:string" />
<xs:complexType name="base64Binary" >
--- 747,751 ----
</xs:simpleType>
-->
! <xs:attribute name="expectedContentTypes" type="xs:string" />
<xs:complexType name="base64Binary" >
***************
*** 915,918 ****
--- 915,924 ----
<td>Moved 2nd and 3rd para from section 3 to section 2.1</td>
</tr>
+ <tr>
+ <td>ASK</td>
+ <td>20050310</td>
+ <td>Per WG decision, changed expectedContentType to
+ expectedConentTypes</td>
+ </tr>
</tbody>
</table>
Index: xml-media-types.html
===================================================================
RCS file: /sources/public/2002/ws/desc/media-types/xml-media-types.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** xml-media-types.html 10 Mar 2005 03:17:58 -0000 1.23
--- xml-media-types.html 10 Mar 2005 21:21:43 -0000 1.24
***************
*** 85,91 ****
2 <a href="#declaration">Attributes for Declaring Content-Type</a><br>
2.1 <a href="#contentType">xmime:contentType Attribute </a><br>
! 2.2 <a href="#expectedContentType">xmime:expectedContentType Attribute </a><br>
3 <a href="#usage">Declaring Content-Type for Binary Data</a><br>
! 3.1 <a href="#role">Role of xmime:expectedContentType Schema Annotation Attribute</a><br>
4 <a href="#more-ex">Examples</a><br>
4.1 <a href="#static">Binary Data with Known Media Type</a><br>
--- 85,91 ----
2 <a href="#declaration">Attributes for Declaring Content-Type</a><br>
2.1 <a href="#contentType">xmime:contentType Attribute </a><br>
! 2.2 <a href="#expectedContentTypes">xmime:expectedContentTypes Attribute </a><br>
3 <a href="#usage">Declaring Content-Type for Binary Data</a><br>
! 3.1 <a href="#role">Role of xmime:expectedContentTypes Schema Annotation Attribute</a><br>
4 <a href="#more-ex">Examples</a><br>
4.1 <a href="#static">Binary Data with Known Media Type</a><br>
***************
*** 127,135 ****
</p></li><li><p>
A XML Schema annotation attribute
! (<em>xmime:expectedContentType</em>) to indicate, in XML Schema, the
expected content-type(s) for an element content whose type is
<em>xs:base64Binary</em> or <em>xs:hexBinary</em>.
</p></li></ul><p>
! The XML Schema annotation, <em>xmime:expectedContentType</em>,
specifies the expected range of values for the
<em>xmime:contentType</em> attribute and the expected range of
--- 127,135 ----
</p></li><li><p>
A XML Schema annotation attribute
! (<em>xmime:expectedContentTypes</em>) to indicate, in XML Schema, the
expected content-type(s) for an element content whose type is
<em>xs:base64Binary</em> or <em>xs:hexBinary</em>.
</p></li></ul><p>
! The XML Schema annotation, <em>xmime:expectedContentTypes</em>,
specifies the expected range of values for the
<em>xmime:contentType</em> attribute and the expected range of
***************
*** 201,208 ****
attribute does not changes the value of the element content.
</p></div><div class="div2">
! <h3><a id="expectedContentType" name="expectedContentType"></a>2.2 xmime:expectedContentType Attribute </h3><p> The <code>xmime:expectedContentType</code> <em>attribute information item</em> has the following Infoset properties:
! </p><ul><li><p>A [local name] of <code>expectedContentType</code>.</p></li><li><p>A [namespace name] of <code>http://www.w3.org/@@@@/@@/xmlmime</code>.</p></li></ul><p>The type of the <code>xmime:expectedContentType</code> <em>attribute information item</em> is
<em>xs:string</em>.</p><p>The value and the meaning of the
! <code>xmime:expectedContentType</code> attribute is similar to the value
allowed for the <code>'Accept'</code> HTTP header defined by HTTP 1.1
specification, Section 14.1 (see <a href="#rfc2616">[IETF RFC 2616]</a>) and MUST
--- 201,208 ----
attribute does not changes the value of the element content.
</p></div><div class="div2">
! <h3><a id="expectedContentTypes" name="expectedContentTypes"></a>2.2 xmime:expectedContentTypes Attribute </h3><p> The <code>xmime:expectedContentTypes</code> <em>attribute information item</em> has the following Infoset properties:
! </p><ul><li><p>A [local name] of <code>expectedContentTypes</code>.</p></li><li><p>A [namespace name] of <code>http://www.w3.org/@@@@/@@/xmlmime</code>.</p></li></ul><p>The type of the <code>xmime:expectedContentTypes</code> <em>attribute information item</em> is
<em>xs:string</em>.</p><p>The value and the meaning of the
! <code>xmime:expectedContentTypes</code> attribute is similar to the value
allowed for the <code>'Accept'</code> HTTP header defined by HTTP 1.1
specification, Section 14.1 (see <a href="#rfc2616">[IETF RFC 2616]</a>) and MUST
***************
*** 213,217 ****
to:
<tbody><tr><td><pre>qdtext = <any CHAR except<">></pre></td></tr></tbody>
! This change is made to disallow non-US-ASCII OCTETs.</p></li></ol><p>The <code>xmime:expectedContentType</code> <em>attribute information item</em> is intended to be
used as part of XML Schema annotation for a <em>binary element information item</em> declaration
(see <a href="#usage"><b>3 Declaring Content-Type for Binary Data</b></a>). This <em>attribute information item</em> is meant to allow
--- 213,217 ----
to:
<tbody><tr><td><pre>qdtext = <any CHAR except<">></pre></td></tr></tbody>
! This change is made to disallow non-US-ASCII OCTETs.</p></li></ol><p>The <code>xmime:expectedContentTypes</code> <em>attribute information item</em> is intended to be
used as part of XML Schema annotation for a <em>binary element information item</em> declaration
(see <a href="#usage"><b>3 Declaring Content-Type for Binary Data</b></a>). This <em>attribute information item</em> is meant to allow
***************
*** 262,275 ****
</xs:schema>
</pre></div></div><div class="div2">
! <h3><a id="role" name="role"></a>3.1 Role of xmime:expectedContentType Schema Annotation Attribute</h3><p>The <code>xmime:expectedContentType</code> attribute is used for annotating
XML Schema to indicate the expected range of content-type of the binary
element content and the expected range of values for
<code>xmime:contentType</code> attribute.
</p><p>The value of the <code>xmime:contentType</code> attribute, if present, SHOULD
! be within the range specified by the <code>xmime:expectedContentType</code>
annotation attribute, if specified in the schema.
See Section 14.1 of <a href="#rfc2616">[IETF RFC 2616]</a> on how to interpret content-type
ranges that may be defined with respect to actual content. When the
! <code>xmime:expectedContentType</code> annotation attribute contains a wild card
("*") or a list of acceptable content-type separated by commas (","),
the schema SHOULD require
--- 262,275 ----
</xs:schema>
</pre></div></div><div class="div2">
! <h3><a id="role" name="role"></a>3.1 Role of xmime:expectedContentTypes Schema Annotation Attribute</h3><p>The <code>xmime:expectedContentTypes</code> attribute is used for annotating
XML Schema to indicate the expected range of content-type of the binary
element content and the expected range of values for
<code>xmime:contentType</code> attribute.
</p><p>The value of the <code>xmime:contentType</code> attribute, if present, SHOULD
! be within the range specified by the <code>xmime:expectedContentTypes</code>
annotation attribute, if specified in the schema.
See Section 14.1 of <a href="#rfc2616">[IETF RFC 2616]</a> on how to interpret content-type
ranges that may be defined with respect to actual content. When the
! <code>xmime:expectedContentTypes</code> annotation attribute contains a wild card
("*") or a list of acceptable content-type separated by commas (","),
the schema SHOULD require
***************
*** 278,286 ****
use the schema annotation to declare the range of expected
values.
! <code>xmime:expectedContentType</code> annotation attribute MAY be used in
conjunction with the declaration of <em>binary element information item</em>s or with complex type
definitions that are derived from <em>xs:base64Binary</em>
or <em>xs:hexBinary</em> in XML Schema. If the
! <code>xmime:expectedContentType</code> annotation attribute is used in
both the <em>binary element information item</em> declaration as well as definition of the complex type
which the <em>binary element information item</em> belongs to, then the expected range of values defined
--- 278,286 ----
use the schema annotation to declare the range of expected
values.
! <code>xmime:expectedContentTypes</code> annotation attribute MAY be used in
conjunction with the declaration of <em>binary element information item</em>s or with complex type
definitions that are derived from <em>xs:base64Binary</em>
or <em>xs:hexBinary</em> in XML Schema. If the
! <code>xmime:expectedContentTypes</code> annotation attribute is used in
both the <em>binary element information item</em> declaration as well as definition of the complex type
which the <em>binary element information item</em> belongs to, then the expected range of values defined
***************
*** 293,297 ****
and specifies the content-type of
the binary content. The schema annotation attribute
! <code>xmime:expectedContentType</code> specifies that the media type
of the binary content is 'image', and the subtype name is either 'jpeg'
or 'png'.
--- 293,297 ----
and specifies the content-type of
the binary content. The schema annotation attribute
! <code>xmime:expectedContentTypes</code> specifies that the media type
of the binary content is 'image', and the subtype name is either 'jpeg'
or 'png'.
***************
*** 320,324 ****
that the element definition will accept -->
<xs:element name="Picture" type="tns:PictureType"
! xmime:expectedContentType="image/jpeg, image/png"/>
</xs:schema>
--- 320,324 ----
that the element definition will accept -->
<xs:element name="Picture" type="tns:PictureType"
! xmime:expectedContentTypes="image/jpeg, image/png"/>
</xs:schema>
***************
*** 357,361 ****
<xs:complexType name="JPEGPictureType"
type="xs:base64Binary"
! xmime:expectedContentType="image/jpeg"/>
<xs:element name="JPEGPicture" type="tns:JPEGPictureType"/>
--- 357,361 ----
<xs:complexType name="JPEGPictureType"
type="xs:base64Binary"
! xmime:expectedContentTypes="image/jpeg"/>
<xs:element name="JPEGPicture" type="tns:JPEGPictureType"/>
***************
*** 380,384 ****
<xs:element name="JPEGPicture" type="xmime:base64Binary"
! xmime:expectedContentType="image/jpeg" />
</xs:schema>
--- 380,384 ----
<xs:element name="JPEGPicture" type="xmime:base64Binary"
! xmime:expectedContentTypes="image/jpeg" />
</xs:schema>
***************
*** 409,413 ****
<xs:element name="JPEGPeferredPicture"
type="tns:JPEGPreferredPictureType"
! xmime:expectedContentType="image/jpeg;q=1.0, image/tiff;q=0.8"/>
</xs:schema>
--- 409,413 ----
<xs:element name="JPEGPeferredPicture"
type="tns:JPEGPreferredPictureType"
! xmime:expectedContentTypes="image/jpeg;q=1.0, image/tiff;q=0.8"/>
</xs:schema>
***************
*** 477,481 ****
</xs:attribute>
! <xs:attribute name="expectedContentType" type="xs:string" />
<xs:complexType name="base64Binary" >
--- 477,481 ----
</xs:attribute>
! <xs:attribute name="expectedContentTypes" type="xs:string" />
<xs:complexType name="base64Binary" >
***************
*** 531,533 ****
References (updated schema refs to 2nd edition, updated 2396 to
3986), fixed examples so that image/* is not an expectedContentType</td></tr><tr><td>ASK</td><td>20050309</td><td>Added another example in section 4.1 to address Kevin's
! concern.</td></tr><tr><td>ASK</td><td>20050309</td><td>Moved 2nd and 3rd para from section 3 to section 2.1</td></tr></tbody></table></div></div></body></html>
\ No newline at end of file
--- 531,534 ----
References (updated schema refs to 2nd edition, updated 2396 to
3986), fixed examples so that image/* is not an expectedContentType</td></tr><tr><td>ASK</td><td>20050309</td><td>Added another example in section 4.1 to address Kevin's
! concern.</td></tr><tr><td>ASK</td><td>20050309</td><td>Moved 2nd and 3rd para from section 3 to section 2.1</td></tr><tr><td>ASK</td><td>20050310</td><td>Per WG decision, changed expectedContentType to
! expectedConentTypes</td></tr></tbody></table></div></div></body></html>
\ No newline at end of file
Received on Thursday, 10 March 2005 21:21:46 UTC