Commit fdbf05db authored by Peter Niblett's avatar Peter Niblett
Browse files

Changes agreed at SDS#40 for Rel-2

parent 3af8c05d
......@@ -371,11 +371,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:restriction base="xs:string" />
</xs:simpleType>
<xs:simpleType name="descriptorRepresentation">
<xs:restriction base="xs:string">
<xs:pattern value="application/rdf\+xml:1" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="e2eCompactJWS">
<xs:restriction base="xs:string" >
......
......@@ -273,9 +273,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="2002" />
<!-- UPDATED -->
<xs:enumeration value="2004" />
<!-- BAD_REQUEST -->
<xs:enumeration value="4000" />
<!-- RELEASE_VERSION_NOT_SUPPORTE -->
<!-- RELEASE_VERSION_NOT_SUPPORTED -->
<xs:enumeration value="4001" />
<!-- NOT_FOUND -->
<xs:enumeration value="4004" />
......@@ -286,9 +288,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- UNSUPPORTED_MEDIA_TYPE -->
<xs:enumeration value="4015" />
<!-- SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE -->
<xs:enumeration value="4101" />
<!-- CONTENTS_UNACCEPTABLE -->
<xs:enumeration value="4102" />
<xs:enumeration value="4101" />
<!-- ORIGINATOR_HAS_NO_PRIVILEGE -->
<xs:enumeration value="4103" />
<!-- GROUP_REQUEST_IDENTIFIER_EXISTS -->
......@@ -313,14 +313,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="4113" />
<!-- ESPRIM_UNKNOWN_RECV_RAND_ID -->
<xs:enumeration value="4114" />
<!-- GESPRIM_BAD_MAC -->
<!-- ESPRIM_BAD_MAC -->
<xs:enumeration value="4115" />
<!-- ESPRIM_IMPERSONATION_ERROR -->
<xs:enumeration value="4116" />
<!-- ORIGINATOR_HAS_ALREADY_REGISTERED -->
<xs:enumeration value="4117" />
<!-- SPECIALIZATION_SCHEMA_NOT_FOUND -->
<xs:enumeration value="4124" />
<xs:enumeration value="4125" />
<!-- INTERNAL_SERVER_ERROR -->
<xs:enumeration value="5000" />
<!-- NOT_IMPLEMENTED -->
......@@ -337,7 +339,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="5204" />
<!-- SUBSCRIPTION_HOST_HAS_NO_PRIVILEGE -->
<xs:enumeration value="5205" />
<!-- NON_BLOCKING_SYNCH_REQUEST_NOT_SUPPORTED -->
<!-- NON_BLOCKING_SYNCH_REQUEST_NOT_SUPPORTED -->
<xs:enumeration value="5206" />
<!-- NOT_ACCEPTABLE -->
<xs:enumeration value="5207" />
......@@ -349,14 +351,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="5210" />
<!-- ESPRIM_ENCRYPTION_ERROR -->
<xs:enumeration value="5211" />
<!-- ESPRIM_ENCRYPTION_ERROR -->
<xs:enumeration value="5212" />
<!-- UNABLE_TO_REPLACE_REQUEST -->
<xs:enumeration value="5219" />
<!-- SPARQL_UPDATE_ERROR -->
<xs:enumeration value="5212" />
<!-- UNABLE_TO_RECALL_REQUEST -->
<xs:enumeration value="5220" />
<!-- SPARQL_UPDATE_ERROR -->
<!-- EXTERNAL_OBJECT_NOT_REACHABLE -->
<xs:enumeration value="6003" />
<!-- EXTERNAL_OBJECT_NOT_FOUND -->
<xs:enumeration value="6005" />
......@@ -1264,5 +1265,24 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="semanticFormat">
<xs:annotation>
<xs:documentation>Used in the semanticDescriptor resource</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- File format: Functional-style -->
<xs:enumeration value="2" />
<!-- File format: OWL/XML -->
<xs:enumeration value="3" />
<!-- File format: RDF/XML -->
<xs:enumeration value="4" />
<!-- File format: RDF/Turtle -->
<xs:enumeration value="5" />
<!-- File format: Manchester -->
<xs:enumeration value="6" />
<!-- File format: JSON-LD -->
<xs:enumeration value="7" />
</xs:restriction>
</xs:simpleType>
</xs:schema>
......@@ -38,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
<xs:element name="creator" type="m2m:ID" minOccurs="0" />
<!-- Resource Specific Attributes -->
<xs:element name="descriptorRepresentation" type="m2m:descriptorRepresentation" minOccurs="0" />
<xs:element name="descriptorRepresentation" type="m2m:semanticFormat" minOccurs="0" />
<xs:element name="semanticOpExec" type="m2m:sparql" minOccurs="0" />
<xs:element name="descriptor" type="xs:base64Binary" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
......@@ -62,7 +62,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announcedResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="descriptorRepresentation" type="m2m:descriptorRepresentation" minOccurs="0" />
<xs:element name="descriptorRepresentation" type="m2m:semanticFormat" minOccurs="0" />
<xs:element name="semanticOpExec" type="m2m:sparql" minOccurs="0" />
<xs:element name="descriptor" type="xs:base64Binary" minOccurs="0" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment