first stab at "formats"

dret · Jun 22, 2016 · 68ee110 · 68ee110
1 parent f623d7d
commit 68ee110
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/home-xml/draft-wilde-home-xml-04-files/home-xml.xml b/home-xml/draft-wilde-home-xml-04-files/home-xml.xml
@@ -1,5 +1,7 @@
 <?xml-stylesheet type="text/xsl" href="home-xml-02.xslt"?>
-<resources xmlns="urn:ietf:params:xml:ns:homedoc" xml:base="tag:me@example.com,2016:">
+<resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:ietf:params:xml:ns:homedoc home-xml.xsd"
+ xmlns="urn:ietf:params:xml:ns:homedoc" xml:base="tag:me@example.com,2016:">
  <resource rel="http://example.org/rel/widgets">
  <link href="/widgets"/>
  </resource>
@@ -14,9 +16,9 @@
  <i>DELETE</i>
  <i>PATCH</i>
  </allow>
- <representations>
- <i>application/json</i>
- </representations>
+ <formats>
+ <format mediatype="application/json"/>
+ </formats>
  <accept-patch>
  <i>application/json-patch+json</i>
  </accept-patch>

diff --git a/home-xml/draft-wilde-home-xml-04-files/home-xml.xsd b/home-xml/draft-wilde-home-xml-04-files/home-xml.xsd
@@ -31,7 +31,17 @@
  <xs:complexType>
  <xs:choice maxOccurs="unbounded" minOccurs="0">
  <xs:element name="allow" type="home:arrayType"/>
- <xs:element name="representations" type="home:arrayType"/>
+ <xs:element name="formats">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="format">
+ <xs:complexType>
+ <xs:attribute name="mediatype" type="home:mediaTypeType"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
  <xs:element name="accept-patch" type="home:arrayType"/>
  <xs:element name="accept-post" type="home:arrayType"/>
  <xs:element name="accept-put" type="home:arrayType"/>
@@ -77,4 +87,7 @@
  <xs:element name="i"/>
  </xs:sequence>
  </xs:complexType>
+ <xs:simpleType name="mediaTypeType">
+ <xs:restriction base="xs:string"/>
+ </xs:simpleType>
 </xs:schema>