Commit 05743b7d authored by Peter Niblett's avatar Peter Niblett

Further work on CommonTypes to align with TS-0004 changes

parent a4154e94
This diff is collapsed.
......@@ -693,5 +693,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="08-001" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="filterUsage">
<xs:annotation>
<xs:documentation>Used in filterCriteria</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- Discovery Criteria -->
<xs:enumeration value="1" />
<!-- Event Notification Criteria -->
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
</xs:schema>
......@@ -36,13 +36,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announceableSubordinateResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="scheduleElement">
<xs:complexType>
<xs:sequence>
<xs:element name="scheduleEntry" type="m2m:scheduleEntry" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
......@@ -62,13 +57,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announcedSubordinateResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="scheduleElement" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="scheduleEntry" type="m2m:scheduleEntry" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="0" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
......
......@@ -78,7 +78,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
<xs:element name="resourceStatus" type="m2m:resourceStatus" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="operationMonitor" type="m2m:operation" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="attribute" type="m2m:attributeTest" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
</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