Skip to content
Snippets Groups Projects
Commit 70e8b81e authored by Wolfgang Granzow's avatar Wolfgang Granzow
Browse files

Merge branch 'master' of https://github.com/oneM2Mdev/oneM2M-schemas

parents a63a01c2 d7d8d38e
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
CDT-commonTypes-v0_8_0.xsd
+ 47
− 26
View file @ 70e8b81e
...@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-enumerationTypes-v0_8_0.xsd" /> <xs:include schemaLocation="CDT-enumerationTypes-v0_8_0.xsd" />
<!-- --> <!--********************** -->
<!-- oneM2M Simple Types --> <!-- oneM2M Simple Types -->
<!-- --> <!--********************** -->
<!-- TODO: Choose appropriate definitions for the id types (xs:token is placeholder for now) --> <!-- TODO: Choose appropriate definitions for the id types (xs:token is placeholder for now) -->
...@@ -175,17 +175,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -175,17 +175,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="scheduleEntry"> <xs:simpleType name="scheduleEntry">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:pattern <xs:pattern
value="([*\d/,-]+\s+){3}[*\d/#L,-]+\s+(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC|[*\d/,-])+\s+(SUN|MON|TUE|WED|THU|FRI|SAT|[*\dL#/,-])+\s+[*\d/,-]+" /> value="(([*]|[1-5]?\d([,-][1-5]?\d)*)\s+){2}([*]|((1?\d|2[0-3])([,-](1?\d|2[0-3]))*))\s+([*]|(([1-9]|1\d|2\d|3[01])([,-]([1-9]|1\d|2\d|3[01]))*))\s+([*]|(([1-9]|1[0-2])([,-]([1-9]|1[0-2]))*))\s+[*]|([0-6]([,-][0-6])*)" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<!-- <xs:simpleType name="stringList"> -->
<!-- <xs:list itemType="xs:string" /> -->
<!-- </xs:simpleType> -->
<xs:simpleType name="triggerRecipientId"> <xs:simpleType name="triggerRecipientId">
<xs:restriction base="xs:unsignedInt" /> <xs:restriction base="xs:unsignedInt" />
</xs:simpleType> </xs:simpleType>
...@@ -195,15 +188,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -195,15 +188,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleType> </xs:simpleType>
<!-- <xs:simpleType name="attribute"> --> <!--********************** -->
<!-- <xs:restriction base="xs:string" /> -->
<!-- </xs:simpleType> -->
<!-- -->
<!-- oneM2M Complex Types --> <!-- oneM2M Complex Types -->
<!-- --> <!--********************** -->
<xs:complexType name="deliveryMetaData"> <xs:complexType name="deliveryMetaData">
<xs:sequence> <xs:sequence>
...@@ -338,14 +325,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -338,14 +325,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="uploadArgsType"> <xs:complexType name="uploadArgsType">
<xs:sequence> <xs:sequence>
<xs:element name="fileType" type="xs:string" /> <xs:element name="fileType" type="xs:string" />
<xs:element name="uRL" type="xs:anyURI" /> <xs:element name="URL" type="xs:anyURI" />
<xs:element name="username" type="xs:string" /> <xs:element name="username" type="xs:string" />
<xs:element name="password" type="xs:string" /> <xs:element name="password" type="xs:string" />
<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" /> <xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="downloadArgsType"> <xs:complexType name="downloadArgsType">
<xs:sequence> <xs:sequence>
<xs:element name="fileType" type="xs:string" /> <xs:element name="fileType" type="xs:string" />
...@@ -362,6 +348,38 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -362,6 +348,38 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="softwareInstallArgsType">
<xs:sequence>
<xs:element name="URL" type="xs:anyURI" />
<xs:element name="UUID" type="xs:string" />
<xs:element name="username" type="xs:string" />
<xs:element name="password" type="xs:string" />
<xs:element name="executionEnvRef" type="xs:string" />
<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
<xs:complexType name="softwareUpdateArgsType">
<xs:sequence>
<xs:element name="UUID" type="xs:string" />
<xs:element name="version" type="xs:string" />
<xs:element name="URL" type="xs:anyURI" />
<xs:element name="username" type="xs:string" />
<xs:element name="password" type="xs:string" />
<xs:element name="executionEnvRef" type="xs:string" />
<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
<xs:complexType name="softwareUninstallArgsType">
<xs:sequence>
<xs:element name="UUID" type="xs:string" />
<xs:element name="version" type="xs:string" />
<xs:element name="executionEnvRef" type="xs:string" />
<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
<xs:complexType name="anyArgsListType"> <xs:complexType name="anyArgsListType">
<xs:sequence> <xs:sequence>
<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" /> <xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
...@@ -370,11 +388,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -370,11 +388,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="execReqArgsListType"> <xs:complexType name="execReqArgsListType">
<xs:choice> <xs:choice>
<xs:element name="reset" type="m2m:resetArgsType" /> <xs:element name="reset" type="m2m:resetArgsType" maxOccurs="unbounded" />
<xs:element name="reboot" type="m2m:rebootArgsType" /> <xs:element name="reboot" type="m2m:rebootArgsType" maxOccurs="unbounded" />
<xs:element name="upload" type="m2m:uploadArgsType" /> <xs:element name="upload" type="m2m:uploadArgsType" maxOccurs="unbounded" />
<xs:element name="download" type="m2m:downloadArgsType" /> <xs:element name="download" type="m2m:downloadArgsType" maxOccurs="unbounded" />
<xs:element name="anyArg" type="m2m:anyArgsListType" minOccurs="0" /> <xs:element name="softwareInstall" type="m2m:softwareInstallArgsType" maxOccurs="unbounded" />
<xs:element name="softwareUpdate" type="m2m:softwareUpdateArgsType" maxOccurs="unbounded" />
<xs:element name="softwareUninstall" type="m2m:softwareUninstallArgsType" maxOccurs="unbounded" />
<xs:element name="anyArg" type="m2m:anyArgsListType" minOccurs="0" maxOccurs="unbounded" />
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment