Revision: f555d5b0e2 Author: tmetsch Date: Tue Jun 8 06:04:34 2010 Log: fixed issue 40 http://code.google.com/p/occi/source/detail?r=f555d5b0e2 Modified: /docs/occi-core.xml /docs/occi-core_book.xml /docs/occi-http_book.xml /docs/occi-infrastructure_book.xml /docs/ogf_template.xsl ======================================= --- /docs/occi-core.xml Thu Feb 18 07:56:29 2010 +++ /docs/occi-core.xml Tue Jun 8 06:04:34 2010 @@ -43,7 +43,8 @@ content negotiation is used to select between alternative representations and metadata including associations between resources is exposed via HTTP headers (e.g. the <computeroutput>Link:</computeroutput> and - <computeroutput>Category:</computeroutput> headers).</para> + <computeroutput>Category:</computeroutput> headers). The categories allow + resources to be grouped - this is done with the help of schemes.</para> <para>In this way OCCI is not responsible for the representations themselves, rather it enables users to organise and group resources @@ -171,15 +172,14 @@ URLs, rather learning them from URLs previously retrieved, in line with RESTful principles:</para> - <screen>> GET /-/compute/ HTTP/1.1 -> Accept: text/uri-list + <screen>> GET /compute/node1 HTTP/1.1 +> Host: example.com +> Accept: */* > -< HTTP/1.1 200 OK -< Content-type: text/uri-list -< -< /us-east/new-york/node17 -< /us-west/san-francisco/node43 -< /europe/paris/node38</screen> +< HTTP/1.1 200 OK +< Server: occi-server/1.0 (linux) OCCI/1.0 +< Date: Wed, 27 Jan 2010 17:26:40 GMT +< [...]</screen> <section> <title>Virtual Addressing</title> @@ -454,9 +454,11 @@ <warning> <para>Defining your own actions can lead to interoperability problems - and should be a last resort reserved for unique functionality. A - simple peer review process is available for extending the registries - which should be used where possible.</para> + and should be a last resort reserved for unique functionality. + Extensions to the registry can be made and should be proposed to the + OCCI working group first. A review process within the OGF group is + available for extending the registries which should be used where + possible.</para> </warning> <para>An <glossterm>action</glossterm> is triggered via an HTTP POST and @@ -775,7 +777,9 @@ < Category: demo; label="My Customer Demo"; scheme="http://example.com/~user/"</screen> <para>Query the category search interface for the desired - category(s):</para> + category(s) (In this case one category: <emphasis>us-west</emphasis> + with the <emphasis>http://example.com/locations</emphasis> + scheme):</para> <screen>> GET /-/compute/us-west HTTP/1.1 > Accept: text/uri-list ======================================= --- /docs/occi-core_book.xml Tue Jan 12 04:29:36 2010 +++ /docs/occi-core_book.xml Tue Jun 8 06:04:34 2010 @@ -46,11 +46,12 @@ </listitem> <listitem> - <para>OCCI XHTML5 rendering</para> + <para>OCCI HTTP Header rendering</para> </listitem> <listitem> - <para>OCCI HTTP Header rendering</para> + <para>(OCCI XHTML5/RDFa rendering) - <emphasis>to be + released</emphasis></para> </listitem> </itemizedlist> @@ -59,7 +60,10 @@ describes the OCCI Core & models.</para> <para>All these parts and the information within are mandatory for - implementors (unless otherwise specified).</para> + implementors (unless otherwise specified). The key words "MUST", "MUST NOT", + "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", + "MAY", and "OPTIONAL" in this document are to be interpreted as described in + RFC 2119. </para> <section> <xi:include href="occi-core.xml" xpointer="xpointer(/*/*)"> @@ -74,10 +78,10 @@ <section> <title>Contributors</title> - <para>The following people have contributed to this document.</para> + <para>The following people edited this document.</para> <table> - <title>List of contributors</title> + <title>List of editors</title> <tgroup cols="3"> <thead> @@ -102,7 +106,7 @@ <row> <entry>Sam Johnston</entry> - <entry>Australian Online Solutions</entry> + <entry>Google</entry> <entry>samj@samj.net</entry> </row> @@ -110,11 +114,32 @@ <row> <entry>Thijs Metsch</entry> - <entry>Sun Microsystems - RESERVOIR project</entry> - - <entry>thijs.metsch@sun.com</entry> + <entry>Sun Microsystems - RESERVOIR project, Platform + Computing</entry> + + <entry>tmetsch@platform.com</entry> </row> - + </tbody> + </tgroup> + </table> + + <para>The editors would like to thank the following contributors:</para> + + <table> + <title>List of contributors</title> + + <tgroup cols="3"> + <thead> + <row> + <entry align="center">Name</entry> + + <entry align="center">Affiliation</entry> + + <entry align="center">Contact</entry> + </row> + </thead> + + <tbody> <row> <entry>Gary Mazzaferro</entry> @@ -122,6 +147,22 @@ <entry>garymazzaferro@gmail.com</entry> </row> + + <row> + <entry>Shlomo Swidler</entry> + + <entry>Orchestratus</entry> + + <entry>shlomo.swidler@ orchestratus.com</entry> + </row> + + <row> + <entry>Michael Behrens</entry> + + <entry>R2AD</entry> + + <entry>michael.behrens@r2ad.com</entry> + </row> </tbody> </tgroup> </table> @@ -161,7 +202,8 @@ <section> <title>Full Copyright Notice</title> - <para>Copyright (C) Open Grid Forum (2009,2010). All Rights Reserved.</para> + <para>Copyright (C) Open Grid Forum (2009,2010). All Rights + Reserved.</para> <para>This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or ======================================= --- /docs/occi-http_book.xml Tue Jan 12 04:29:36 2010 +++ /docs/occi-http_book.xml Tue Jun 8 06:04:34 2010 @@ -46,11 +46,12 @@ </listitem> <listitem> - <para>OCCI XHTML5 rendering</para> + <para>OCCI HTTP Header rendering</para> </listitem> <listitem> - <para>OCCI HTTP Header rendering</para> + <para>(OCCI XHTML5/RDFa rendering) - <emphasis>to be + released</emphasis></para> </listitem> </itemizedlist> @@ -60,7 +61,10 @@ interface for OCCI.</para> <para>All these parts and the information within are mandatory for - implementors (unless otherwise specified).</para> + implementors (unless otherwise specified). The key words "MUST", "MUST NOT", + "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", + "MAY", and "OPTIONAL" in this document are to be interpreted as described in + RFC 2119. </para> <section> <xi:include href="occi-http.xml" xpointer="xpointer(/*/*)"> @@ -75,10 +79,10 @@ <section> <title>Contributors</title> - <para>The following people have contributed to this document.</para> + <para>The following people edited this document.</para> <table> - <title>List of contributors</title> + <title>List of editors</title> <tgroup cols="3"> <thead> @@ -103,7 +107,7 @@ <row> <entry>Sam Johnston</entry> - <entry>Australian Online Solutions</entry> + <entry>Google</entry> <entry>samj@samj.net</entry> </row> @@ -111,11 +115,32 @@ <row> <entry>Thijs Metsch</entry> - <entry>Sun Microsystems - RESERVOIR project</entry> - - <entry>thijs.metsch@sun.com</entry> + <entry>Sun Microsystems - RESERVOIR project, Platform + Computing</entry> + + <entry>tmetsch@platform.com</entry> </row> - + </tbody> + </tgroup> + </table> + + <para>The editors would like to thank the following contributors:</para> + + <table> + <title>List of contributors</title> + + <tgroup cols="3"> + <thead> + <row> + <entry align="center">Name</entry> + + <entry align="center">Affiliation</entry> + + <entry align="center">Contact</entry> + </row> + </thead> + + <tbody> <row> <entry>Gary Mazzaferro</entry> @@ -123,6 +148,22 @@ <entry>garymazzaferro@gmail.com</entry> </row> + + <row> + <entry>Shlomo Swidler</entry> + + <entry>Orchestratus</entry> + + <entry>shlomo.swidler@ orchestratus.com</entry> + </row> + + <row> + <entry>Michael Behrens</entry> + + <entry>R2AD</entry> + + <entry>michael.behrens@r2ad.com</entry> + </row> </tbody> </tgroup> </table> @@ -162,7 +203,8 @@ <section> <title>Full Copyright Notice</title> - <para>Copyright (C) Open Grid Forum (2009,2010). All Rights Reserved.</para> + <para>Copyright (C) Open Grid Forum (2009,2010). All Rights + Reserved.</para> <para>This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or ======================================= --- /docs/occi-infrastructure_book.xml Tue Jun 1 03:24:17 2010 +++ /docs/occi-infrastructure_book.xml Tue Jun 8 06:04:34 2010 @@ -50,10 +50,8 @@ </listitem> <listitem> - <para>(OCCI XHTML5 rendering)<footnote> - <para>The OCCI XHTML5 rendering will be released in near - future.</para> - </footnote></para> + <para>(OCCI XHTML5/RDFa rendering) - <emphasis>to be + released</emphasis></para> </listitem> </itemizedlist> @@ -62,7 +60,10 @@ describes the OCCI Infrastructure models.</para> <para>All these parts and the information within are mandatory for - implementors (unless otherwise specified).</para> + implementors (unless otherwise specified). The key words "MUST", "MUST NOT", + "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", + "MAY", and "OPTIONAL" in this document are to be interpreted as described in + RFC 2119. </para> <section> <xi:include href="occi-infrastructure.xml" xpointer="xpointer(/*/*)"> @@ -152,7 +153,7 @@ <entry>Orchestratus</entry> - <entry>shlomo.swidler@orchestratus.com</entry> + <entry>shlomo.swidler@ orchestratus.com</entry> </row> <row> ======================================= --- /docs/ogf_template.xsl Tue Jun 1 03:24:17 2010 +++ /docs/ogf_template.xsl Tue Jun 8 06:04:34 2010 @@ -154,7 +154,7 @@ </fo:block> <fo:block> - <xsl:text>Jun. 1, 2010</xsl:text> + <xsl:text>Jun. 8, 2010</xsl:text> </fo:block> </xsl:when> </xsl:choose>