diff --git a/v1_12_0/CDT-commonTypes-v1_12_0.xsd b/v1_12_0/CDT-commonTypes-v1_12_0.xsd index 1f7e1897c3c8d7a339181e2997c713a648e401f7..9f321f6a5e1c03ee1673c114793ebb33511c0f61 100644 --- a/v1_12_0/CDT-commonTypes-v1_12_0.xsd +++ b/v1_12_0/CDT-commonTypes-v1_12_0.xsd @@ -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> diff --git a/v1_12_0/CDT-enumerationTypes-v1_12_0.xsd b/v1_12_0/CDT-enumerationTypes-v1_12_0.xsd index 4229687fc6fe359d272b1d999b75324ef34f661d..67e85b6280e2bdc8ee32430b6c0d35a195980a8f 100644 --- a/v1_12_0/CDT-enumerationTypes-v1_12_0.xsd +++ b/v1_12_0/CDT-enumerationTypes-v1_12_0.xsd @@ -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> diff --git a/v1_12_0/CDT-m2mServiceSubscriptionProfile-v1_12_0.xsd b/v1_12_0/CDT-m2mServiceSubscriptionProfile-v1_12_0.xsd index 3c5a6325aa9b2b3b8948f31f5e999249a3340bcc..fc2e77969a0782f1d73f4849d4e370a586047d06 100644 --- a/v1_12_0/CDT-m2mServiceSubscriptionProfile-v1_12_0.xsd +++ b/v1_12_0/CDT-m2mServiceSubscriptionProfile-v1_12_0.xsd @@ -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" />