Skip to content

Commit

Permalink
V4.02 CSD01 release candidate (#252)
Browse files Browse the repository at this point in the history
  • Loading branch information
ralfhandl authored Feb 28, 2024
1 parent d642c03 commit dbd9b88
Show file tree
Hide file tree
Showing 47 changed files with 276 additions and 114 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
node_modules
coverage
.DS_Store
/zip/*
!/zip/*.zip
20 changes: 10 additions & 10 deletions docs/odata-csdl-json/odata-csdl-json.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<hr />
<h1 id="odata-common-schema-definition-language-csdl-json-representation-version-402">OData Common Schema Definition Language (CSDL) JSON Representation Version 4.02</h1>
<h2 id="committee-specification-draft-01">Committee Specification Draft 01</h2>
<h2 id="14-july-2023">14 July 2023</h2>
<h2 id="28-february-2024">28 February 2024</h2>
<p><span class="math inline">\(\hbox{}\)</span></p>
<h4 id="this-stage">This stage:</h4>
<p><a href="https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/csd01/odata-csdl-json-v4.02-csd01.md">https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/csd01/odata-csdl-json-v4.02-csd01.md</a> (Authoritative)<br />
Expand Down Expand Up @@ -151,9 +151,9 @@ <h4 id="key-words">Key words:</h4>
<h4 id="citation-format">Citation format:</h4>
<p>When referencing this specification the following citation format should be used:</p>
<p><strong>[OData-CSDL-JSON-v4.02]</strong></p>
<p><em>OData Common Schema Definition Language (CSDL) JSON Representation Version 4.02</em>. Edited by Ralf Handl, Michael Pizzo, and Heiko Theißen. 14 July 2023. OASIS Committee Specification Draft 01. <a href="https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/csd01/odata-csdl-json-v4.02-csd01.html">https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/csd01/odata-csdl-json-v4.02-csd01.html</a>. Latest stage: <a href="https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/odata-csdl-json-v4.02.html">https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/odata-csdl-json-v4.02.html</a>.</p>
<p><em>OData Common Schema Definition Language (CSDL) JSON Representation Version 4.02</em>. Edited by Ralf Handl, Michael Pizzo, and Heiko Theißen. 28 February 2024. OASIS Committee Specification Draft 01. <a href="https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/csd01/odata-csdl-json-v4.02-csd01.html">https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/csd01/odata-csdl-json-v4.02-csd01.html</a>. Latest stage: <a href="https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/odata-csdl-json-v4.02.html">https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/odata-csdl-json-v4.02.html</a>.</p>
<h4 id="notices">Notices</h4>
<p>Copyright © OASIS Open 2023. All Rights Reserved.</p>
<p>Copyright © OASIS Open 2024. All Rights Reserved.</p>
<p>Distributed under the terms of the OASIS <a href="https://www.oasis-open.org/policies-guidelines/ipr/">IPR Policy</a>.</p>
<p>The name “OASIS” is a trademark of <a href="https://www.oasis-open.org/">OASIS</a>, the owner and developer of this specification, and should be used only to refer to the organization and its official outputs.</p>
<p>For complete copyright information please see the full Notices section in an Appendix below.</p>
Expand Down Expand Up @@ -380,15 +380,15 @@ <h2 id="11-changes-from-earlier-versions"><a name="ChangesfromEarlierVersions" h
</thead>
<tbody>
<tr class="odd">
<td><a href="#PathEvaluation">Section 14.4.1.2</a></td>
<td>New path evaluation rules for annotations targeting annotations and external targeting via container</td>
<td><a href="https://issues.oasis-open.org/browse/ODATA-1420">ODATA-1420</a></td>
</tr>
<tr class="even">
<td><a href="#PrimitiveTypes">Section 3.3</a></td>
<td>Allow stream-valued non-binding parameters</td>
<td><a href="https://issues.oasis-open.org/browse/ODATA-1481">ODATA-1481</a></td>
</tr>
<tr class="even">
<td><a href="#PathEvaluation">Section 14.4.1.2</a></td>
<td>New path evaluation rules for annotations targeting annotations and external targeting via container</td>
<td><a href="https://issues.oasis-open.org/browse/ODATA-1420">ODATA-1420</a></td>
</tr>
</tbody>
</table>
<h2 id="12-glossary"><a name="Glossary" href="#Glossary">1.2 Glossary</a></h2>
Expand Down Expand Up @@ -3943,7 +3943,7 @@ <h1 id="appendix-d-revision-history"><a name="RevisionHistory" href="#RevisionHi
<tbody>
<tr class="odd">
<td style="text-align: left;">Committee Specification Draft 01</td>
<td style="text-align: left;">2023-07-14</td>
<td style="text-align: left;">2024-02-28</td>
<td style="text-align: left;">Michael Pizzo<br>Ralf Handl<br>Heiko Theißen</td>
<td style="text-align: left;"></td>
</tr>
Expand All @@ -3962,7 +3962,7 @@ <h1 id="appendix-d-revision-history"><a name="RevisionHistory" href="#RevisionHi
-->

<h1 id="appendix-e-notices"><a name="Notices" href="#Notices">Appendix E. Notices</a></h1>
<p>Copyright © OASIS Open 2023. All Rights Reserved.</p>
<p>Copyright © OASIS Open 2024. All Rights Reserved.</p>
<p>All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual Property Rights Policy (the “OASIS IPR Policy”). The full <a href="https://www.oasis-open.org/policies-guidelines/ipr/">Policy</a> may be found at the OASIS website.</p>
<p>This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published, and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this section are included on all such copies and derivative works. However, this document itself may not be modified in any way, including by removing the copyright notice or references to OASIS, except as needed for the purpose of developing any document or deliverable produced by an OASIS Technical Committee (in which case the rules applicable to copyrights, as set forth in the OASIS IPR Policy, must be followed) or as required to translate it into languages other than English.</p>
<p>The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.</p>
Expand Down
12 changes: 6 additions & 6 deletions docs/odata-csdl-json/odata-csdl-json.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

## Committee Specification Draft 01

## 14 July 2023
## 28 February 2024

$\hbox{}$

Expand Down Expand Up @@ -76,12 +76,12 @@ When referencing this specification the following citation format should be used
**[OData-CSDL-JSON-v4.02]**

_OData Common Schema Definition Language (CSDL) JSON Representation Version 4.02_.
Edited by Ralf Handl, Michael Pizzo, and Heiko Theißen. 14 July 2023. OASIS Committee Specification Draft 01.
Edited by Ralf Handl, Michael Pizzo, and Heiko Theißen. 28 February 2024. OASIS Committee Specification Draft 01.
https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/csd01/odata-csdl-json-v4.02-csd01.html.
Latest stage: https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/odata-csdl-json-v4.02.html.

#### Notices
Copyright &copy; OASIS Open 2023. All Rights Reserved.
Copyright © OASIS Open 2024. All Rights Reserved.

Distributed under the terms of the OASIS [IPR Policy](https://www.oasis-open.org/policies-guidelines/ipr/).

Expand Down Expand Up @@ -259,8 +259,8 @@ modifications made necessary to fully cover OData CSDL Version 4.01.

Section | Feature / Change | Issue
--------|------------------|------
[Section 14.4.1.2](#PathEvaluation)| New path evaluation rules for annotations targeting annotations and external targeting via container| [ODATA-1420](https://issues.oasis-open.org/browse/ODATA-1420)
[Section 3.3](#PrimitiveTypes)| Allow stream-valued non-binding parameters| [ODATA-1481](https://issues.oasis-open.org/browse/ODATA-1481)
[Section 14.4.1.2](#PathEvaluation)| New path evaluation rules for annotations targeting annotations and external targeting via container| [ODATA-1420](https://issues.oasis-open.org/browse/ODATA-1420)

## <a name="Glossary" href="#Glossary">1.2 Glossary</a>

Expand Down Expand Up @@ -6204,7 +6204,7 @@ acknowledged.

| Revision | Date | Editor | Changes Made |
| :--- | :--- | :--- | :--- |
Committee Specification Draft 01|2023-07-14|Michael Pizzo<br>Ralf Handl<br>Heiko Theißen|
Committee Specification Draft 01|2024-02-28|Michael Pizzo<br>Ralf Handl<br>Heiko Theißen|
<!--
Working Draft 01 |2016-11-16|Ralf Handl|Initial version
Committee Specification Draft 01|2017-06-08|Michael Pizzo<br>Ralf Handl| Integrated 4.01 features
Expand All @@ -6219,7 +6219,7 @@ Candidate OASIS Standard 02 |2020-04-09|Michael Pizzo<br>Ralf Handl| Non-mat

# <a name="Notices" href="#Notices">Appendix E. Notices</a>

Copyright © OASIS Open 2023. All Rights Reserved.
Copyright © OASIS Open 2024. All Rights Reserved.

All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The full [Policy](https://www.oasis-open.org/policies-guidelines/ipr/) may be found at the OASIS website.

Expand Down
Binary file modified docs/odata-csdl-json/odata-csdl-json.pdf
Binary file not shown.
9 changes: 9 additions & 0 deletions docs/odata-csdl-json/styles/odata.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ table {
padding: 2pt 6pt;
white-space: nowrap;
}

.example td em {
font-weight: bold;
color: blue;
Expand Down Expand Up @@ -123,11 +124,13 @@ table {
.key-1 th:first-of-type {
background-color: olive;
}

.obj-1 th:first-of-type,
.obj-2 th:nth-of-type(2),
.obj-3 th:nth-of-type(3) {
background-color: green;
}

.temp-2 th:nth-of-type(2),
.temp-4 th:nth-of-type(4) {
background-color: mediumseagreen;
Expand Down Expand Up @@ -227,3 +230,9 @@ td {
h2[id="22-example-data"] {
page-break-before: always;
}

@media print {
pre>code.sourceCode>span {
display: inline-block;
}
}
36 changes: 18 additions & 18 deletions docs/odata-csdl-xml/odata-csdl-xml.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,18 @@
<hr />
<h1 id="odata-common-schema-definition-language-csdl-xml-representation-version-402">OData Common Schema Definition Language (CSDL) XML Representation Version 4.02</h1>
<h2 id="committee-specification-draft-01">Committee Specification Draft 01</h2>
<h2 id="14-july-2023">14 July 2023</h2>
<h2 id="28-february-2024">28 February 2024</h2>
<p><span class="math inline">\(\hbox{}\)</span></p>
<h4 id="this-stage">This stage:</h4>
<p><a href="https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/csd01/odata-csdl-xml-v4.02-csd01.md">https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/csd01/odata-csdl-xml-v4.02-csd01.md</a> (Authoritative)<br />
<a href="https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/csd01/odata-csdl-xml-v4.02-csd01.html">https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/csd01/odata-csdl-xml-v4.02-csd01.html</a><br />
<a href="https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/csd01/odata-csdl-xml-v4.02-csd01.pdf">https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/csd01/odata-csdl-xml-v4.02-csd01.pdf</a></p>
<p><a href="https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/csd01/odata-csdl-xml-v4.02-csd01.md">https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/csd01/odata-csdl-xml-v4.02-csd01.md</a> (Authoritative)<br />
<a href="https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/csd01/odata-csdl-xml-v4.02-csd01.html">https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/csd01/odata-csdl-xml-v4.02-csd01.html</a><br />
<a href="https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/csd01/odata-csdl-xml-v4.02-csd01.pdf">https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/csd01/odata-csdl-xml-v4.02-csd01.pdf</a></p>
<h4 id="previous-stage">Previous stage:</h4>
<p>N/A</p>
<h4 id="latest-stage">Latest stage:</h4>
<p><a href="https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/odata-csdl-json-v4.02.md">https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/odata-csdl-json-v4.02.md</a> (Authoritative)<br />
<a href="https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/odata-csdl-json-v4.02.html">https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/odata-csdl-json-v4.02.html</a><br />
<a href="https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/odata-csdl-json-v4.02.pdf">https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/odata-csdl-json-v4.02.pdf</a></p>
<p><a href="https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/odata-csdl-xml-v4.02.md">https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/odata-csdl-xml-v4.02.md</a> (Authoritative)<br />
<a href="https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/odata-csdl-xml-v4.02.html">https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/odata-csdl-xml-v4.02.html</a><br />
<a href="https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/odata-csdl-xml-v4.02.pdf">https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/odata-csdl-xml-v4.02.pdf</a></p>
<h4 id="technical-committee">Technical Committee:</h4>
<p><a href="https://www.oasis-open.org/committees/odata/">OASIS Open Data Protocol (OData) TC</a></p>
<h4 id="chairs">Chairs:</h4>
Expand Down Expand Up @@ -150,10 +150,10 @@ <h4 id="key-words">Key words:</h4>
<p>The key words “MUST”, “MUST NOT”, “REQUIRED”, “SHALL”, “SHALL NOT”, “SHOULD”, “SHOULD NOT”, “RECOMMENDED”, “NOT RECOMMENDED”, “MAY”, and “OPTIONAL” in this document are to be interpreted as described in BCP 14 <a href="#rfc2119">RFC2119</a> and <a href="#rfc8174">RFC8174</a> when, and only when, they appear in all capitals, as shown here.</p>
<h4 id="citation-format">Citation format:</h4>
<p>When referencing this specification the following citation format should be used:</p>
<p><strong>[OData-CSDL-JSON-v4.02]</strong></p>
<p><em>OData Common Schema Definition Language (CSDL) JSON Representation Version 4.02</em>. Edited by Ralf Handl, Michael Pizzo, and Heiko Theißen. 14 July 2023. OASIS Committee Specification Draft 01. <a href="https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/csd01/odata-csdl-xml-v4.02-csd01.html">https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/csd01/odata-csdl-xml-v4.02-csd01.html</a>. Latest stage: <a href="https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/odata-csdl-json-v4.02.html">https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/odata-csdl-json-v4.02.html</a>.</p>
<p><strong>[OData-CSDL-XML-v4.02]</strong></p>
<p><em>OData Common Schema Definition Language (CSDL) XML Representation Version 4.02</em>. Edited by Ralf Handl, Michael Pizzo, and Heiko Theißen. 28 February 2024. OASIS Committee Specification Draft 01. <a href="https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/csd01/odata-csdl-xml-v4.02-csd01.html">https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/csd01/odata-csdl-xml-v4.02-csd01.html</a>. Latest stage: <a href="https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/odata-csdl-xml-v4.02.html">https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/odata-csdl-xml-v4.02.html</a>.</p>
<h4 id="notices">Notices</h4>
<p>Copyright © OASIS Open 2023. All Rights Reserved.</p>
<p>Copyright © OASIS Open 2024. All Rights Reserved.</p>
<p>Distributed under the terms of the OASIS <a href="https://www.oasis-open.org/policies-guidelines/ipr/">IPR Policy</a>.</p>
<p>The name “OASIS” is a trademark of <a href="https://www.oasis-open.org/">OASIS</a>, the owner and developer of this specification, and should be used only to refer to the organization and its official outputs.</p>
<p>For complete copyright information please see the full Notices section in an Appendix below.</p>
Expand Down Expand Up @@ -375,20 +375,20 @@ <h2 id="11-changes-from-earlier-versions"><a name="ChangesfromEarlierVersions" h
</thead>
<tbody>
<tr class="odd">
<td><a href="#PrimitiveTypes">Section 3.3</a></td>
<td>Allow stream-valued non-binding parameters</td>
<td><a href="https://issues.oasis-open.org/browse/ODATA-1481">ODATA-1481</a></td>
</tr>
<tr class="even">
<td><a href="#EntityContainer">Section 13</a></td>
<td>All children of <code>edm:EntityContainer</code> are optional</td>
<td><a href="https://issues.oasis-open.org/browse/ODATA-1571">ODATA-1571</a></td>
</tr>
<tr class="even">
<tr class="odd">
<td><a href="#PathEvaluation">Section 14.4.1.2</a></td>
<td>New path evaluation rules for annotations targeting annotations and external targeting via container</td>
<td><a href="https://issues.oasis-open.org/browse/ODATA-1420">ODATA-1420</a></td>
</tr>
<tr class="odd">
<td><a href="#PrimitiveTypes">Section 3.3</a></td>
<td>Allow stream-valued non-binding parameters</td>
<td><a href="https://issues.oasis-open.org/browse/ODATA-1481">ODATA-1481</a></td>
</tr>
</tbody>
</table>
<h2 id="12-glossary"><a name="Glossary" href="#Glossary">1.2 Glossary</a></h2>
Expand Down Expand Up @@ -3675,7 +3675,7 @@ <h1 id="appendix-d-revision-history"><a name="RevisionHistory" href="#RevisionHi
<tbody>
<tr class="odd">
<td style="text-align: left;">Committee Specification Draft 01</td>
<td style="text-align: left;">2023-07-14</td>
<td style="text-align: left;">2024-02-28</td>
<td style="text-align: left;">Michael Pizzo<br>Ralf Handl<br>Heiko Theißen</td>
<td style="text-align: left;"></td>
</tr>
Expand All @@ -3694,7 +3694,7 @@ <h1 id="appendix-d-revision-history"><a name="RevisionHistory" href="#RevisionHi
-->

<h1 id="appendix-e-notices"><a name="Notices" href="#Notices">Appendix E. Notices</a></h1>
<p>Copyright © OASIS Open 2023. All Rights Reserved.</p>
<p>Copyright © OASIS Open 2024. All Rights Reserved.</p>
<p>All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual Property Rights Policy (the “OASIS IPR Policy”). The full <a href="https://www.oasis-open.org/policies-guidelines/ipr/">Policy</a> may be found at the OASIS website.</p>
<p>This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published, and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this section are included on all such copies and derivative works. However, this document itself may not be modified in any way, including by removing the copyright notice or references to OASIS, except as needed for the purpose of developing any document or deliverable produced by an OASIS Technical Committee (in which case the rules applicable to copyrights, as set forth in the OASIS IPR Policy, must be followed) or as required to translate it into languages other than English.</p>
<p>The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.</p>
Expand Down
Loading

0 comments on commit dbd9b88

Please sign in to comment.