Commit 47848213 authored by Wolfgang Granzow's avatar Wolfgang Granzow

v1_1_0 updates (batch 2)

parent a5beb387
......@@ -26,12 +26,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
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-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-container-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-group-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-accessControlPolicy-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-pollingChannel-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-container-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-group-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-accessControlPolicy-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-pollingChannel-v1_1_0.xsd" />
<xs:element name="AE">
<xs:complexType>
......
......@@ -26,23 +26,23 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
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-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-remoteCSE-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-node-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-AE-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-container-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-group-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-accessControlPolicy-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-mgmtCmd-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-locationPolicy-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-statsConfig-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-statsCollect-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-request-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-delivery-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-schedule-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-remoteCSE-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-node-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-AE-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-container-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-group-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-accessControlPolicy-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-mgmtCmd-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-locationPolicy-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-statsConfig-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-statsCollect-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-request-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-delivery-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-schedule-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_1_0.xsd" />
<xs:element name="CSEBase">
<xs:complexType>
......
......@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:element name="activeCmdhPolicy">
<xs:complexType>
......
......@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="areaNwkDeviceInfo">
<xs:complexType>
......
......@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="areaNwkInfo">
<xs:complexType>
......
......@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="battery">
<xs:complexType>
......
......@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:element name="cmdhBuffer">
<xs:complexType>
......
......@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:element name="cmdhDefEcValue">
<xs:complexType>
......
......@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:element name="cmdhDefaults">
<xs:complexType>
......
......@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:element name="cmdhEcDefParamValues">
<xs:complexType>
......
......@@ -28,8 +28,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="cmdhLimits">
<xs:complexType>
......@@ -41,17 +41,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- mgmtObj specialization-specific Attributes -->
<xs:element name="order" type="xs:positiveInteger" />
<xs:element name="requestOrigin" type="m2m:listOfM2MID" />
<!-- TODO In TS-0004 requestContext is shown as xs:string rather than xs:anyType -->
<xs:element name="requestContext" type="xs:anyType" />
<xs:element name="requestContextNotification" type="xs:boolean" minOccurs="0" />
<!-- TODO In TS-0004 requestCharacteristics is shown as xs:string rather than xs:anyType -->
<xs:element name="requestCharacteristics" type="xs:anyType" />
<xs:element name="limitsEventCategory" type="m2m:listOfEventCat" />
<xs:element name="limitsRequestExpTime" type="m2m:listOfMinMax" />
<xs:element name="limitsResultExpTime" type="m2m:listOfMinMax" />
<xs:element name="limitsOpExecTime" type="m2m:listOfMinMax" />
<xs:element name="limitsRespPersistence" type="m2m:listOfMinMax" />
<!-- TODO: TS-0004 D.12.5 uses type "m2m:permittedBooleanValues" -->
<xs:element name="limitsDelAggregation" >
<xs:simpleType>
<xs:restriction base="xs:token">
......
......@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:element name="cmdhNetworkAccessRules">
<xs:complexType>
......
......@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:element name="cmdhNwAccessRule">
<xs:complexType>
......
......@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:element name="cmdhPolicy" >
<xs:complexType>
......
......@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-contentInstance-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-contentInstance-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="container">
<xs:complexType>
......
......@@ -27,9 +27,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
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-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:element name="contentInstance">
<xs:complexType>
......
......@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
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-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="delivery">
......
......@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="deviceCapability">
<xs:complexType>
......
......@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="deviceInfo">
<xs:complexType>
......
......@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
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-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="eventConfig">
<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