Commit 886a5e43 authored by Wolfgang Granzow's avatar Wolfgang Granzow
Browse files

R3-changes agreed at PRO#29

See PRO-2017-0141 for a detailed description of the changes
parent fcdd96d8
...@@ -376,7 +376,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -376,7 +376,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="descriptorRepresentation"> <xs:simpleType name="descriptorRepresentation">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:pattern value="application\/rdf\+xml\:1" /> <xs:pattern value="application/rdf\+xml:1" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
...@@ -443,7 +443,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -443,7 +443,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="metaInformation"> <xs:complexType name="metaInformation">
<xs:sequence> <xs:sequence>
<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" /> <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" />
<xs:element name="name" type="xs:NCName" minOccurs="0" />
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" /> <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" />
<xs:element name="requestExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0" /> <xs:element name="requestExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
<xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0" /> <xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
...@@ -501,7 +500,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -501,7 +500,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="authorSignIndicator" type="xs:boolean" minOccurs="0"/> <xs:element name="authorSignIndicator" type="xs:boolean" minOccurs="0"/>
<xs:element name="authorSigns" type="m2m:signatureList" minOccurs="0"/> <xs:element name="authorSigns" type="m2m:signatureList" minOccurs="0"/>
<xs:element name="authorRelIndicator" type="xs:boolean" minOccurs="0"/> <xs:element name="authorRelIndicator" type="xs:boolean" minOccurs="0"/>
<xs:element name="originator" type="m2m:ID" minOccurs="0"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
...@@ -527,6 +525,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -527,6 +525,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" /> <xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" />
<xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" /> <xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" />
<xs:element name="labels" type="m2m:labels" minOccurs="0" /> <xs:element name="labels" type="m2m:labels" minOccurs="0" />
<xs:element name="labelsQuery" type="xs:string" minOccurs="0" />
<xs:element name="resourceType" type="m2m:resourceTypeList" minOccurs="0" /> <xs:element name="resourceType" type="m2m:resourceTypeList" minOccurs="0" />
<xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" /> <xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
...@@ -1104,7 +1103,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -1104,7 +1103,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="dynAuthRelMapRequest"> <xs:complexType name="dynAuthRelMapRequest">
<xs:sequence> <xs:sequence>
<xs:element name="originator" type="m2m:ID" minOccurs="0" /> <xs:element name="originator" type="m2m:ID" minOccurs="0" />
<xs:element name="tokenIDs" minOccurs="1" > <xs:element name="tokenIDs" minOccurs="0" >
<xs:simpleType> <xs:simpleType>
<xs:restriction> <xs:restriction>
<xs:simpleType> <xs:simpleType>
...@@ -1131,7 +1130,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -1131,7 +1130,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="dynAuthRelMapResponse"> <xs:complexType name="dynAuthRelMapResponse">
<xs:sequence> <xs:sequence>
<xs:element name="tokenIDs" minOccurs="1" > <xs:element name="tokenIDs" minOccurs="0" >
<xs:simpleType> <xs:simpleType>
<xs:restriction> <xs:restriction>
<xs:simpleType> <xs:simpleType>
...@@ -1152,7 +1151,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -1152,7 +1151,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleType> </xs:simpleType>
</xs:element> </xs:element>
<xs:element name="authorSignReqInfo" type="xs:boolean" minOccurs="0" /> <xs:element name="authorSignReqInfo" type="xs:boolean" minOccurs="0" />
<xs:element name="authorSigns" type="m2m:signatureList" minOccurs="0" /> <xs:element name="signature" type="m2m:signatureList" minOccurs="0" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
......
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