Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PRO
XSD
Commits
a39956cd
Commit
a39956cd
authored
Mar 27, 2015
by
Wolfgang Granzow
Browse files
v1_1_0 updates (batch 1)
parent
aaf31369
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
41 deletions
+13
-41
v1_1_0/CDT-accessControlPolicy-v1_1_0.xsd
v1_1_0/CDT-accessControlPolicy-v1_1_0.xsd
+2
-17
v1_1_0/CDT-commonTypes-v1_1_0.xsd
v1_1_0/CDT-commonTypes-v1_1_0.xsd
+6
-18
v1_1_0/CDT-enumerationTypes-v1_1_0.xsd
v1_1_0/CDT-enumerationTypes-v1_1_0.xsd
+0
-1
v1_1_0/CDT-requestPrimitive-v1_1_0.xsd
v1_1_0/CDT-requestPrimitive-v1_1_0.xsd
+1
-1
v1_1_0/CDT-schedule-v1_1_0.xsd
v1_1_0/CDT-schedule-v1_1_0.xsd
+2
-2
v1_1_0/CDT-subscription-v1_1_0.xsd
v1_1_0/CDT-subscription-v1_1_0.xsd
+2
-2
No files found.
v1_1_0/CDT-accessControlPolicy-v1_1_0.xsd
View file @
a39956cd
...
...
@@ -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:xs=
"http://www.w3.org/2001/XMLSchema"
elementFormDefault=
"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=
"accessControlPolicy"
>
<xs:complexType>
...
...
@@ -75,8 +75,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:element>
<!-- TODO: define short names for "setOfAcrs" and all its elements names (CR to TS-0004 for next PRO WG meeting) -->
<xs:complexType
name=
"setOfAcrs"
>
<xs:sequence>
<xs:element
name=
"accessControlRule"
type=
"m2m:accessControlRule"
minOccurs=
"0"
...
...
@@ -91,22 +89,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- accessControlOperations defined as enumerated list 1 ... 63 -->
<xs:element
name=
"accessControlOperations"
type=
"m2m:accessControlOperations"
/>
<!-- TODO: mismatch with TS-0004 where "accessControlContexts" has multiplicity 0..1 -->
<xs:element
name=
"accessControlContexts"
minOccurs=
"0"
maxOccurs=
"unbounded"
>
<xs:complexType>
<xs:sequence>
<!-- TODO: mismatch with TS-0003 where element is called "accessControlTimeWindows" -->
<!-- TODO: mismatch with TS-0001 where element is called "accessControlTimeWindow" -->
<xs:element
name=
"accessControlWindow"
type=
"m2m:scheduleEntry"
minOccurs=
"0"
maxOccurs=
"unbounded"
/>
<!-- TODO: mismatch with TS-0001: element is called accessControlIpAddress in TS-0001" in TS-0003 -->
<xs:element
name=
"accessControlIpAddresses"
minOccurs=
"0"
>
<xs:complexType>
<xs:sequence>
<!-- TODO: it should be possible to include both IPv6 and IPv4 address. Present text in TS-0004 is ambiguous. Not
clear if "or" in TS-0001 is inclusive or exclusive. Below it is interpreted as inclusive. -->
<!-- TODO: the element names ipv4Addresses and ipv6Addresses are not explicitly mentioned in TS-0004 -->
<xs:element
name=
"ipv4Addresses"
minOccurs=
"0"
maxOccurs=
"1"
>
<!-- space separated list of IPv4 addresses -->
<xs:simpleType>
...
...
@@ -122,9 +111,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
</xs:element>
<!-- TODO: mismatch with TS-0003 and TS-0004 where element is called "accessControlLocationRegions" -->
<!-- TODO: mismatch with TS-0004 where element has multiplicity [0..n] -->
<xs:element
name=
"accessControlLocationRegion"
type=
"m2m:locationRegion"
minOccurs=
"0"
/>
</xs:sequence>
</xs:complexType>
...
...
@@ -170,7 +156,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Initial IPv4 and IPv6 address representation types were found here:
http://lists.w3.org/Archives/Public/www-xml-schema-comments/2005OctDec/0138.html, CIDR suffix has been added -->
<!-- TODO: Need to add more descriptive text into TS-0004 about structure of IPv4 and IPv6 addresses with optional CIDR suffix -->
<xs:simpleType
name=
"ipv4"
>
<xs:annotation>
<xs:documentation>
An IP version 4 address, with optional CIDR suffix in the range /0
...
...
v1_1_0/CDT-commonTypes-v1_1_0.xsd
View file @
a39956cd
...
...
@@ -25,7 +25,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<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:xs=
"http://www.w3.org/2001/XMLSchema"
elementFormDefault=
"unqualified"
>
<xs:include
schemaLocation=
"CDT-enumerationTypes-v1_
0
_0.xsd"
/>
<xs:include
schemaLocation=
"CDT-enumerationTypes-v1_
1
_0.xsd"
/>
<!--********************** -->
<!-- oneM2M Simple Types -->
...
...
@@ -65,12 +65,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<list
itemType=
"xs:anyURI"
/>
</xs:simpleType>
<!-- TODO: "labels" is called "labelsType" in Table 6.3.2-1 -->
<xs:simpleType
name=
"labels"
>
<xs:list
itemType=
"xs:token"
/>
</xs:simpleType>
<!-- TODO: this data type is not used in any of the XSD files. It is listed in TS-0004 without any given use case -->
<xs:simpleType
name=
"networkaccessID"
>
<xs:restriction
base=
"xs:token"
>
</xs:restriction>
...
...
@@ -184,7 +182,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
<!-- TODO: triggerRecipientID is not in Table 6.3.2-1 -->
<xs:simpleType
name=
"triggerRecipientID"
>
<xs:restriction
base=
"xs:unsignedInt"
/>
</xs:simpleType>
...
...
@@ -280,7 +277,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
<!-- TODO: The format for attribute shown in clause 6.3.4 cannot take complex content, so it is done differently here -->
<xs:complexType
name=
"attribute"
>
<xs:sequence>
<xs:element
name=
"name"
type=
"xs:NCName"
/>
...
...
@@ -310,8 +306,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
<!-- TODO: TS-0004 calls the member elements "name" and "type", but name and value seems more appropriate -->
<xs:complexType
name=
"anyArgType"
>
<xs:sequence>
<xs:element
name=
"name"
type=
"xs:NCName"
/>
...
...
@@ -389,7 +383,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
<!-- TODO: - TS-0004 also shows an anyArg option, but this isn't compatible with the cmdType, so has been omitted -->
<xs:complexType
name=
"execReqArgsListType"
>
<xs:choice>
<xs:element
name=
"reset"
type=
"m2m:resetArgsType"
maxOccurs=
"unbounded"
/>
...
...
@@ -399,11 +392,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<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:complexType>
<!-- TODO: - TS-0004 gives the datatype of name as xs:string -->
<xs:complexType
name=
"mgmtLinkRef"
>
<xs:simpleContent>
<xs:extension
base=
"xs:anyURI"
>
...
...
@@ -423,7 +414,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- m2m:accessControlRule and m2m:locationRegion are defined in the accessControlPolicy xsd file -->
<!-- TODO: - TS-0004 gives the datatype of name as xs:string -->
<xs:complexType
name=
"childResourceRef"
>
<xs:simpleContent>
<xs:extension
base=
"xs:anyURI"
>
...
...
@@ -433,7 +423,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleContent>
</xs:complexType>
<!-- TODO: - This is in TS-0004 but is not used by any other schema -->
<xs:complexType
name=
"responseTypeInfo"
>
<xs:sequence>
<xs:element
name=
"responseType"
type=
"m2m:responseType"
/>
...
...
@@ -441,22 +430,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
<!-- TODO: order of elements should be aligned with the one in responsePrimitive -->
<xs:complexType
name=
"operationResult"
>
<xs:sequence>
<xs:element
name=
"responseStatusCode"
type=
"m2m:responseStatusCode"
/>
<xs:element
name=
"requestIdentifier"
type=
"m2m:requestID"
/>
<xs:element
name=
"content"
type=
"m2m:primitiveContent"
minOccurs=
"0"
/>
<xs:element
name=
"
eventCategory"
type=
"m2m:eventCat
"
minOccurs=
"0"
/>
<xs:element
name=
"
to"
type=
"xs:anyURI
"
minOccurs=
"0"
/>
<xs:element
name=
"from"
type=
"m2m:ID"
minOccurs=
"0"
/>
<xs:element
name=
"originatingTimestamp"
type=
"m2m:timestamp"
minOccurs=
"0"
/>
<xs:element
name=
"requestIdentifier"
type=
"m2m:requestID"
/>
<xs:element
name=
"resultExpirationTimestamp"
type=
"m2m:timestamp"
minOccurs=
"0"
/>
<xs:element
name=
"to"
type=
"xs:anyURI"
minOccurs=
"0"
/>
<xs:element
name=
"responseStatusCode"
type=
"m2m:responseStatusCode"
/>
<xs:element
name=
"eventCategory"
type=
"m2m:eventCat"
minOccurs=
"0"
/>
</xs:sequence>
</xs:complexType>
<!-- Resource type definitions. These types include the "common attributes" that are used by oneM2M Resources Each oneM2M
<!-- Resource type definitions. These types include the "common attributes" that are used by oneM2M Resources
.
Each oneM2M
Resource has a resource type that is defined in a separate schema, but each resource type extends one of the types that is
defined below -->
...
...
v1_1_0/CDT-enumerationTypes-v1_1_0.xsd
View file @
a39956cd
...
...
@@ -273,7 +273,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration
value=
"6003"
/>
<!-- EXTERNAL_OBJECT_NOT_FOUND -->
<xs:enumeration
value=
"6005"
/>
<!-- TODO: Typo in the table in TS-0004 -->
<!-- MAX_NUMBER_OF_MEMBER_EXCEEDED -->
<xs:enumeration
value=
"6010"
/>
<!-- MEMBER_TYPE_INCONSISTENT -->
...
...
v1_1_0/CDT-requestPrimitive-v1_1_0.xsd
View file @
a39956cd
...
...
@@ -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:res
ourc
eType"
minOccurs=
"0"
/>
<xs:element
name=
"responseType"
type=
"m2m:res
pons
eType
Info
"
minOccurs=
"0"
/>
<!-- parameter "Result Persistence" -->
<xs:element
name=
"resultPersistence"
type=
"xs:duration"
minOccurs=
"0"
/>
<!-- parameter "Result Content" -->
...
...
v1_1_0/CDT-schedule-v1_1_0.xsd
View file @
a39956cd
...
...
@@ -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=
"schedule"
>
<xs:complexType>
...
...
v1_1_0/CDT-subscription-v1_1_0.xsd
View file @
a39956cd
...
...
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:schema
xmlns=
"http://www.w3.org/2001/XMLSchema"
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-schedule-v1_
0
_0.xsd"
/>
<xs:include
schemaLocation=
"CDT-commonTypes-v1_
1
_0.xsd"
/>
<xs:include
schemaLocation=
"CDT-schedule-v1_
1
_0.xsd"
/>
<xs:element
name=
"subscription"
>
<xs:complexType>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment