From b4952f7b41e10d0be57e1c73f78e8186b6e0588c Mon Sep 17 00:00:00 2001 From: PeterNiblett <pdn3270@gmail.com> Date: Fri, 27 Mar 2015 15:44:51 +0100 Subject: [PATCH] v1_0_0 to v1_1_0 --- v1_1_0/CDT-eventLog-v1_1_0.xsd | 4 +-- v1_1_0/CDT-execInstance-v1_1_0.xsd | 4 +-- v1_1_0/CDT-firmware-v1_1_0.xsd | 4 +-- v1_1_0/CDT-group-v1_1_0.xsd | 4 +-- v1_1_0/CDT-locationPolicy-v1_1_0.xsd | 4 +-- ...T-m2mServiceSubscriptionProfile-v1_1_0.xsd | 7 ++--- v1_1_0/CDT-memory-v1_1_0.xsd | 4 +-- v1_1_0/CDT-mgmtCmd-v1_1_0.xsd | 6 ++-- v1_1_0/CDT-node-v1_1_0.xsd | 28 +++++++++---------- v1_1_0/CDT-notification-v1_1_0.xsd | 4 +-- v1_1_0/CDT-pollingChannel-v1_1_0.xsd | 4 +-- v1_1_0/CDT-reboot-v1_1_0.xsd | 4 +-- v1_1_0/CDT-remoteCSE-v1_1_0.xsd | 20 ++++++------- v1_1_0/CDT-request-v1_1_0.xsd | 4 +-- v1_1_0/CDT-requestPrimitive-v1_1_0.xsd | 4 +-- v1_1_0/CDT-responsePrimitive-v1_1_0.xsd | 2 +- 16 files changed, 53 insertions(+), 54 deletions(-) diff --git a/v1_1_0/CDT-eventLog-v1_1_0.xsd b/v1_1_0/CDT-eventLog-v1_1_0.xsd index 240f582..9dca355 100644 --- a/v1_1_0/CDT-eventLog-v1_1_0.xsd +++ b/v1_1_0/CDT-eventLog-v1_1_0.xsd @@ -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="eventLog"> <xs:complexType> diff --git a/v1_1_0/CDT-execInstance-v1_1_0.xsd b/v1_1_0/CDT-execInstance-v1_1_0.xsd index 309bab9..8729a4d 100644 --- a/v1_1_0/CDT-execInstance-v1_1_0.xsd +++ b/v1_1_0/CDT-execInstance-v1_1_0.xsd @@ -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="execInstance"> <xs:complexType> diff --git a/v1_1_0/CDT-firmware-v1_1_0.xsd b/v1_1_0/CDT-firmware-v1_1_0.xsd index 8ce8d68..17605ca 100644 --- a/v1_1_0/CDT-firmware-v1_1_0.xsd +++ b/v1_1_0/CDT-firmware-v1_1_0.xsd @@ -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="firmware"> <xs:complexType> diff --git a/v1_1_0/CDT-group-v1_1_0.xsd b/v1_1_0/CDT-group-v1_1_0.xsd index 574b822..bfe4893 100644 --- a/v1_1_0/CDT-group-v1_1_0.xsd +++ b/v1_1_0/CDT-group-v1_1_0.xsd @@ -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="group"> <xs:complexType> diff --git a/v1_1_0/CDT-locationPolicy-v1_1_0.xsd b/v1_1_0/CDT-locationPolicy-v1_1_0.xsd index d35d772..acafaa1 100644 --- a/v1_1_0/CDT-locationPolicy-v1_1_0.xsd +++ b/v1_1_0/CDT-locationPolicy-v1_1_0.xsd @@ -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="locationPolicy"> <xs:complexType> diff --git a/v1_1_0/CDT-m2mServiceSubscriptionProfile-v1_1_0.xsd b/v1_1_0/CDT-m2mServiceSubscriptionProfile-v1_1_0.xsd index f8752e1..1285331 100644 --- a/v1_1_0/CDT-m2mServiceSubscriptionProfile-v1_1_0.xsd +++ b/v1_1_0/CDT-m2mServiceSubscriptionProfile-v1_1_0.xsd @@ -26,10 +26,9 @@ 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-serviceSubscribedNode-v1_0_0.xsd" /> + <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_1_0.xsd" /> <xs:element name="m2mServiceSubscriptionProfile"> <xs:complexType> diff --git a/v1_1_0/CDT-memory-v1_1_0.xsd b/v1_1_0/CDT-memory-v1_1_0.xsd index ad1a8a8..bc584cd 100644 --- a/v1_1_0/CDT-memory-v1_1_0.xsd +++ b/v1_1_0/CDT-memory-v1_1_0.xsd @@ -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="memory"> <xs:complexType> diff --git a/v1_1_0/CDT-mgmtCmd-v1_1_0.xsd b/v1_1_0/CDT-mgmtCmd-v1_1_0.xsd index aafb610..51a61d1 100644 --- a/v1_1_0/CDT-mgmtCmd-v1_1_0.xsd +++ b/v1_1_0/CDT-mgmtCmd-v1_1_0.xsd @@ -26,9 +26,9 @@ 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-execInstance-v1_0_0.xsd" /> + <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-execInstance-v1_1_0.xsd" /> <xs:element name="mgmtCmd"> <xs:complexType> diff --git a/v1_1_0/CDT-node-v1_1_0.xsd b/v1_1_0/CDT-node-v1_1_0.xsd index a7d1043..f607d87 100644 --- a/v1_1_0/CDT-node-v1_1_0.xsd +++ b/v1_1_0/CDT-node-v1_1_0.xsd @@ -27,20 +27,20 @@ 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-memory-v1_0_0.xsd" /> - <xs:include schemaLocation="CDT-battery-v1_0_0.xsd" /> - <xs:include schemaLocation="CDT-areaNwkInfo-v1_0_0.xsd" /> - <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_0_0.xsd" /> - <xs:include schemaLocation="CDT-firmware-v1_0_0.xsd" /> - <xs:include schemaLocation="CDT-software-v1_0_0.xsd" /> - <xs:include schemaLocation="CDT-deviceInfo-v1_0_0.xsd" /> - <xs:include schemaLocation="CDT-deviceCapability-v1_0_0.xsd" /> - <xs:include schemaLocation="CDT-reboot-v1_0_0.xsd" /> - <xs:include schemaLocation="CDT-eventLog-v1_0_0.xsd" /> - <xs:include schemaLocation="CDT-cmdhPolicy-v1_0_0.xsd" /> - <xs:include schemaLocation="CDT-activeCmdhPolicy-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-memory-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-battery-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-areaNwkInfo-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-firmware-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-software-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-deviceInfo-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-deviceCapability-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-reboot-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-eventLog-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-cmdhPolicy-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" /> <xs:element name="node"> <xs:complexType> diff --git a/v1_1_0/CDT-notification-v1_1_0.xsd b/v1_1_0/CDT-notification-v1_1_0.xsd index f3cc457..0d0b46c 100644 --- a/v1_1_0/CDT-notification-v1_1_0.xsd +++ b/v1_1_0/CDT-notification-v1_1_0.xsd @@ -24,8 +24,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR 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-responsePrimitive-v1_0_0.xsd"/> + <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd"/> + <xs:include schemaLocation="CDT-responsePrimitive-v1_1_0.xsd"/> <xs:element name="notification" type="m2m:notification" /> diff --git a/v1_1_0/CDT-pollingChannel-v1_1_0.xsd b/v1_1_0/CDT-pollingChannel-v1_1_0.xsd index 6fb3d66..adf6540 100644 --- a/v1_1_0/CDT-pollingChannel-v1_1_0.xsd +++ b/v1_1_0/CDT-pollingChannel-v1_1_0.xsd @@ -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="pollingChannel"> <xs:complexType> diff --git a/v1_1_0/CDT-reboot-v1_1_0.xsd b/v1_1_0/CDT-reboot-v1_1_0.xsd index e8e5854..e1adbb1 100644 --- a/v1_1_0/CDT-reboot-v1_1_0.xsd +++ b/v1_1_0/CDT-reboot-v1_1_0.xsd @@ -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="reboot"> <xs:complexType> diff --git a/v1_1_0/CDT-remoteCSE-v1_1_0.xsd b/v1_1_0/CDT-remoteCSE-v1_1_0.xsd index bced1c2..e8c5809 100644 --- a/v1_1_0/CDT-remoteCSE-v1_1_0.xsd +++ b/v1_1_0/CDT-remoteCSE-v1_1_0.xsd @@ -26,17 +26,17 @@ 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: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-pollingChannel-v1_0_0.xsd" /> - <xs:include schemaLocation="CDT-schedule-v1_0_0.xsd" /> - <xs:include schemaLocation="CDT-node-v1_0_0.xsd" /> - <xs:include schemaLocation="CDT-locationPolicy-v1_0_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-pollingChannel-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-schedule-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-node-v1_1_0.xsd" /> + <xs:include schemaLocation="CDT-locationPolicy-v1_1_0.xsd" /> <xs:element name="remoteCSE"> <xs:complexType> diff --git a/v1_1_0/CDT-request-v1_1_0.xsd b/v1_1_0/CDT-request-v1_1_0.xsd index 5156d7f..fc9448c 100644 --- a/v1_1_0/CDT-request-v1_1_0.xsd +++ b/v1_1_0/CDT-request-v1_1_0.xsd @@ -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="request"> <xs:complexType> diff --git a/v1_1_0/CDT-requestPrimitive-v1_1_0.xsd b/v1_1_0/CDT-requestPrimitive-v1_1_0.xsd index b2bf4e3..7c273c2 100644 --- a/v1_1_0/CDT-requestPrimitive-v1_1_0.xsd +++ b/v1_1_0/CDT-requestPrimitive-v1_1_0.xsd @@ -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="requestPrimitive" > <xs:complexType> @@ -56,7 +56,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <!-- parameter "Operation Execution Time" --> <xs:element name="operationExecutionTime" type="m2m:timestamp" minOccurs="0"/> <!-- parameter "Response Type" --> - <xs:element name="responseType" type="m2m:responseTypeInfo" minOccurs="0"/> + <xs:element name="responseType" type="m2m:resourceType" minOccurs="0"/> <!-- parameter "Result Persistence" --> <xs:element name="resultPersistence" type="xs:duration" minOccurs="0"/> <!-- parameter "Result Content" --> diff --git a/v1_1_0/CDT-responsePrimitive-v1_1_0.xsd b/v1_1_0/CDT-responsePrimitive-v1_1_0.xsd index 6f78e01..40307ce 100644 --- a/v1_1_0/CDT-responsePrimitive-v1_1_0.xsd +++ b/v1_1_0/CDT-responsePrimitive-v1_1_0.xsd @@ -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="responsePrimitive" > <xs:complexType> -- GitLab