diff --git a/CDT-CSEBase-v0_8_0.xsd b/CDT-CSEBase-v0_8_0.xsd index 5b3e7b55fb660dfcceb39273ee554300e646d1f8..48c4f13519a9ab2bcdf8689a1634309f977e9cd3 100644 --- a/CDT-CSEBase-v0_8_0.xsd +++ b/CDT-CSEBase-v0_8_0.xsd @@ -41,6 +41,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-request-v0_8_0.xsd" /> <xs:include schemaLocation="CDT-delivery-v0_8_0.xsd" /> <xs:include schemaLocation="CDT-schedule-v0_8_0.xsd" /> + <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v0_8_0.xsd" /> + <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v0_8_0.xsd" /> <xs:element name="CSEBase"> <xs:complexType> @@ -51,7 +53,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <!-- Resource Specific Attributes --> <xs:element name="accessControlPolicyIDs" type="m2m:acpType" minOccurs="0" /> <xs:element name="cseType" type="m2m:cseTypeID" minOccurs="0" /> - <!-- TODO: update TS-0004 to say m2m:ID not m2m:id --> <xs:element name="CSE-ID" type="m2m:ID" /> <!-- TODO: update TS-0004 to remove m2m:resourceTypeList --> <xs:element name="supportedResourceType"> @@ -61,8 +62,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:element> <xs:element name="pointOfAccess" type="m2m:pOAList" /> <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" /> - <xs:element name="notificationCongestionPolicy" type="m2m:notificationCongestionPolicy" minOccurs="0" /> - + <!-- Child Resources --> <xs:choice minOccurs="0" maxOccurs="1"> <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> @@ -81,6 +81,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:request" /> <xs:element ref="m2m:delivery" /> <xs:element ref="m2m:schedule" /> + <xs:element ref="m2m:m2mServiceSubscriptionProfile" /> + <xs:element ref="m2m:serviceSubscribedAppRule" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/CDT-enumerationTypes-v0_8_0.xsd b/CDT-enumerationTypes-v0_8_0.xsd index 16eeeec24247c5bcaea891c9ab9bfc4014df8c98..d9dd56979bf86324ab43a7218027f7ac2391787c 100644 --- a/CDT-enumerationTypes-v0_8_0.xsd +++ b/CDT-enumerationTypes-v0_8_0.xsd @@ -679,21 +679,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> - <!-- TODO: to be defined (needs CR) --> - <xs:simpleType name="notificationCongestionPolicy"> - <xs:annotation> - <xs:documentation></xs:documentation> - </xs:annotation> - <xs:restriction base="xs:integer"> - <!-- TBD --> - <xs:enumeration value="1" /> - <!-- TBD --> - <xs:enumeration value="2" /> - <!-- TBD --> - <xs:enumeration value="3" /> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="primitiveType"> <xs:annotation> <xs:documentation></xs:documentation> diff --git a/CDT-serviceSubscribedAppRule-v0_8_0.xsd b/CDT-serviceSubscribedAppRule-v0_8_0.xsd new file mode 100644 index 0000000000000000000000000000000000000000..283ac7b33439ac9951bb0e6c74d6db235eeb0f6c --- /dev/null +++ b/CDT-serviceSubscribedAppRule-v0_8_0.xsd @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright Notification + +The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices +contained in the original materials on any copies of the materials and that you comply strictly with these terms. +This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of +any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. +© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved. + +Notice of Disclaimer & Limitation of Liability + +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. +No recommendation as to products or vendors is made or should be implied. + +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. +NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER. + +--> +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" + xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> + <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" /> + + <xs:element name="serviceSubscribedAppRule"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes --> + <xs:extension base="m2m:regularResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="applicableCredIDs" type="m2m:listOfM2MID" minOccurs="0" /> + <xs:element name="allowedApp-IDs" type="m2m:listOfM2MID" minOccurs="0" /> + <xs:element name="allowedAEs" type="m2m:listOfM2MID" minOccurs="0" /> + + <!-- Child Resources --> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" /> + <xs:element ref="m2m:subscription" maxOccurs="unbounded" /> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> +</xs:schema>