Commit c7f85b9e authored by Wolfgang Granzow's avatar Wolfgang Granzow
Browse files

Release-1 changes agreed at TP#22

See detailed list of changes in document
PRO-2016-0141-PRO22_changes_of_XML_schemas_to_align_with_TS-0004
parent 083d1bfc
...@@ -258,6 +258,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -258,6 +258,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<list itemType="xs:NCName" /> <list itemType="xs:NCName" />
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="resourceTypeList">
<xs:restriction>
<xs:simpleType>
<xs:list itemType="m2m:resourceType" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
<!--********************** --> <!--********************** -->
<!-- oneM2M Complex Types --> <!-- oneM2M Complex Types -->
...@@ -328,7 +336,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -328,7 +336,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="resourceType" type="m2m:resourceType" 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" />
<xs:element name="contentType" type="m2m:typeOfContent" minOccurs="0" maxOccurs="unbounded" /> <xs:element name="contentType" type="m2m:typeOfContent" minOccurs="0" maxOccurs="unbounded" />
...@@ -585,6 +593,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -585,6 +593,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:complexType name="subordinateResource">
<xs:complexContent>
<xs:extension base="m2m:resource">
<xs:sequence>
<xs:element name="expirationTime" type="m2m:timestamp" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="announcedSubordinateResource"> <xs:complexType name="announcedSubordinateResource">
<xs:complexContent> <xs:complexContent>
......
...@@ -34,7 +34,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -34,7 +34,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType> <xs:complexType>
<xs:complexContent> <xs:complexContent>
<!-- Inherit common attributes --> <!-- Inherit common attributes -->
<xs:extension base="m2m:regularResource"> <xs:extension base="m2m:subordinateResource">
<xs:sequence> <xs:sequence>
<!-- No Resource Specific Attributes --> <!-- No Resource Specific Attributes -->
......
...@@ -155,7 +155,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -155,7 +155,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:statsConfig" /> <xs:element ref="m2m:statsConfig" />
<xs:element ref="m2m:subscription" /> <xs:element ref="m2m:subscription" />
</xs:choice> </xs:choice>
<xs:element name="URIList" type="m2m:listOfURIs" /> <xs:element name="URI" type="xs:anyURI" />
</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