Commit b346d37f authored by Wolfgang Granzow's avatar Wolfgang Granzow

Rel-1 changes approved at PRO#27

See PRO-2017-0058 for the CR references and detailed list of changes
parent 1d08c462
......@@ -325,7 +325,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="primitiveContent">
<xs:sequence>
<xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
<xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" minOccurs="0" />
</xs:sequence>
</xs:complexType>
......
......@@ -883,32 +883,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="SRole-ID">
<xs:restriction base="xs:token">
<!-- Software Management -->
<xs:enumeration value="01-001" />
<!-- Device Configuration -->
<xs:enumeration value="02-001" />
<!-- Device Diagnostics and Management -->
<xs:enumeration value="02-002" />
<!-- Device Firmware Management -->
<xs:enumeration value="02-003" />
<!-- Device Topology -->
<xs:enumeration value="02-004" />
<!-- Location -->
<xs:enumeration value="03-001" />
<!-- Basic Data -->
<xs:enumeration value="04-001" />
<!-- Onboarding -->
<xs:enumeration value="05-001" />
<!-- Security Administration -->
<xs:enumeration value="06-001" />
<!-- Groups Management -->
<xs:enumeration value="07-001" />
<!-- Event Collection -->
<xs:enumeration value="08-001" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="filterUsage">
<xs:annotation>
......
......@@ -37,12 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:regularResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="serviceRoles" minOccurs="0">
<xs:simpleType>
<xs:list itemType="m2m:SRole-ID" />
</xs:simpleType>
</xs:element>
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
......
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