Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
XSD
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PRO
XSD
Commits
f4f23f04
Commit
f4f23f04
authored
Nov 27, 2015
by
Wolfgang Granzow
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates agreed at PRO#20
See list of CRs and implemented changes in PRO-2015-1060
parent
2d128885
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
97 additions
and
30 deletions
+97
-30
CDT-AE-v1_5_0.xsd
v1_5_0/CDT-AE-v1_5_0.xsd
+2
-0
CDT-commonTypes-v1_5_0.xsd
v1_5_0/CDT-commonTypes-v1_5_0.xsd
+33
-3
CDT-enumerationTypes-v1_5_0.xsd
v1_5_0/CDT-enumerationTypes-v1_5_0.xsd
+5
-2
CDT-group-v1_5_0.xsd
v1_5_0/CDT-group-v1_5_0.xsd
+4
-4
CDT-notification-v1_5_0.xsd
v1_5_0/CDT-notification-v1_5_0.xsd
+2
-1
CDT-requestPrimitive-v1_5_0.xsd
v1_5_0/CDT-requestPrimitive-v1_5_0.xsd
+1
-3
CDT-AE-v2_3_0.xsd
v2_3_0/CDT-AE-v2_3_0.xsd
+2
-0
CDT-commonTypes-v2_3_0.xsd
v2_3_0/CDT-commonTypes-v2_3_0.xsd
+37
-8
CDT-enumerationTypes-v2_3_0.xsd
v2_3_0/CDT-enumerationTypes-v2_3_0.xsd
+5
-2
CDT-group-v2_3_0.xsd
v2_3_0/CDT-group-v2_3_0.xsd
+4
-4
CDT-notification-v2_3_0.xsd
v2_3_0/CDT-notification-v2_3_0.xsd
+1
-0
CDT-requestPrimitive-v2_3_0.xsd
v2_3_0/CDT-requestPrimitive-v2_3_0.xsd
+1
-3
No files found.
v1_5_0/CDT-AE-v1_5_0.xsd
View file @
f4f23f04
...
...
@@ -48,6 +48,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element
name=
"ontologyRef"
type=
"xs:anyURI"
minOccurs=
"0"
/>
<xs:element
name=
"nodeLink"
type=
"xs:anyURI"
minOccurs=
"0"
/>
<xs:element
name=
"requestReachability"
type=
"xs:boolean"
/>
<xs:element
name=
"contentSerialization"
type=
"m2m:serializations"
minOccurs=
"0"
/>
<!-- Child Resources -->
<xs:choice
minOccurs=
"0"
maxOccurs=
"1"
>
...
...
@@ -81,6 +82,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element
name=
"ontologyRef"
type=
"xs:anyURI"
minOccurs=
"0"
/>
<xs:element
name=
"nodeLink"
type=
"xs:anyURI"
minOccurs=
"0"
/>
<xs:element
name=
"requestReachability"
type=
"xs:boolean"
minOccurs=
"0"
/>
<xs:element
name=
"contentSerialization"
type=
"m2m:serializations"
minOccurs=
"0"
/>
<!-- Child Resources -->
<xs:choice
minOccurs=
"0"
maxOccurs=
"1"
>
...
...
v1_5_0/CDT-commonTypes-v1_5_0.xsd
View file @
f4f23f04
...
...
@@ -135,11 +135,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:minLength
value=
"1"
/>
</xs:restriction>
</xs:simpleType>
<!--Format is YYYYMMDDThhmmss
with no punctuation
-->
<!--Format is YYYYMMDDThhmmss
,ssssss with optional up to 6 digits of fractional seconds
-->
<xs:simpleType
name=
"timestamp"
>
<xs:restriction
base=
"xs:string"
>
<xs:pattern
value=
"\d{4}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|30|31)T([01]\d|2[0-3])[0-5]\d[0-5]\d"
></xs:pattern>
<xs:pattern
value=
"\d{4}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|30|31)T([01]\d|2[0-3])[0-5]\d[0-5]\d
(,\d{1,6})?
"
></xs:pattern>
</xs:restriction>
</xs:simpleType>
...
...
@@ -163,7 +164,27 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:pattern
value=
"[\w/!#$^_.+&\-]+"
/>
</xs:restriction>
</xs:simpleType>
<!-- auxiliary data type required to define "serializations" below -->
<xs:simpleType
name=
"permittedMediaTypes"
>
<xs:restriction
base=
"m2m:typeOfContent"
>
<xs:enumeration
value=
"application/xml"
/>
<xs:enumeration
value=
"application/json"
/>
</xs:restriction>
</xs:simpleType>
<!-- "serializations" data type is a list of permitted media types as defined above -->
<xs:simpleType
name=
"serializations"
>
<xs:restriction>
<xs:simpleType>
<xs:list
itemType=
"m2m:permittedMediaTypes"
/>
</xs:simpleType>
<xs:minLength
value=
"1"
/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType
name=
"contentInfo"
>
<xs:restriction
base=
"xs:string"
>
<xs:pattern
value=
"[\w/!#$^_.+&\-]+(:[0-2])?"
/>
...
...
@@ -454,7 +475,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType
name=
"responseTypeInfo"
>
<xs:sequence>
<xs:element
name=
"responseTypeValue"
type=
"m2m:responseType"
/>
<xs:element
name=
"notificationURI"
type=
"xs:anyURI"
minOccurs=
"0"
maxOccurs=
"unbounded"
/>
<xs:element
name=
"notificationURI"
>
<xs:simpleType>
<xs:restriction>
<xs:simpleType>
<xs:list
itemType=
"xs:anyURI"
/>
</xs:simpleType>
<xs:minLength
value=
"0"
/>
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
...
...
v1_5_0/CDT-enumerationTypes-v1_5_0.xsd
View file @
f4f23f04
...
...
@@ -256,7 +256,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- NO_PRIVILEGE -->
<xs:enumeration
value=
"5105"
/>
<!-- ALREADY_EXISTS -->
<xs:enumeration
value=
"5106"
/>
<xs:enumeration
value=
"5106"
/>
<!-- NOT_ACCEPTABLE -->
<xs:enumeration
value=
"5107"
/>
<!-- TARGET_NOT_SUBSCRIBABLE -->
<xs:enumeration
value=
"5203"
/>
<!-- SUBSCRIPTION_VERIFICATION_INITIATION_FAILED -->
...
...
@@ -533,7 +535,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType
name=
"notificationEventType"
>
<xs:annotation>
<xs:documentation>
Used in the notificationEventType element of eventNotificationCriteria attribute of subscruiption resource
</xs:documentation>
<xs:documentation>
Used in the notificationEventType element of eventNotificationCriteria attribute of subscription resource
and in the Notification data object
</xs:documentation>
</xs:annotation>
<xs:restriction
base=
"xs:integer"
>
<!-- Update of Resource -->
...
...
v1_5_0/CDT-group-v1_5_0.xsd
View file @
f4f23f04
...
...
@@ -39,8 +39,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:sequence>
<xs:element
name=
"creator"
type=
"m2m:ID"
minOccurs=
"0"
/>
<xs:element
name=
"memberType"
type=
"m2m:memberType"
/>
<xs:element
name=
"currentNrOfMembers"
type=
"xs:
nonNega
tiveInteger"
/>
<xs:element
name=
"maxNrOfMembers"
type=
"xs:
nonNega
tiveInteger"
/>
<xs:element
name=
"currentNrOfMembers"
type=
"xs:
posi
tiveInteger"
/>
<xs:element
name=
"maxNrOfMembers"
type=
"xs:
posi
tiveInteger"
/>
<xs:element
name=
"memberIDs"
type=
"m2m:listOfURIs"
/>
<xs:element
name=
"membersAccessControlPolicyIDs"
type=
"m2m:listOfURIs"
minOccurs=
"0"
/>
<xs:element
name=
"memberTypeValidated"
type=
"xs:boolean"
/>
...
...
@@ -68,8 +68,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:sequence>
<xs:element
name=
"memberType"
type=
"m2m:memberType"
minOccurs=
"0"
/>
<xs:element
name=
"currentNrOfMembers"
type=
"xs:
nonNega
tiveInteger"
minOccurs=
"0"
/>
<xs:element
name=
"maxNrOfMembers"
type=
"xs:
nonNega
tiveInteger"
minOccurs=
"0"
/>
<xs:element
name=
"currentNrOfMembers"
type=
"xs:
posi
tiveInteger"
minOccurs=
"0"
/>
<xs:element
name=
"maxNrOfMembers"
type=
"xs:
posi
tiveInteger"
minOccurs=
"0"
/>
<xs:element
name=
"memberIDs"
type=
"m2m:listOfURIs"
minOccurs=
"0"
/>
<xs:element
name=
"membersAccessControlPolicyIDs"
type=
"m2m:listOfURIs"
minOccurs=
"0"
/>
<xs:element
name=
"memberTypeValidated"
type=
"xs:boolean"
minOccurs=
"0"
/>
...
...
v1_5_0/CDT-notification-v1_5_0.xsd
View file @
f4f23f04
...
...
@@ -51,7 +51,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element
name=
"originator"
type=
"m2m:ID"
minOccurs=
"0"
/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:element>
<xs:element
name=
"notificationEventType"
type=
"m2m:notificationEventType"
minOccurs=
"0"
/>
</xs:sequence>
</xs:complexType>
</xs:element>
...
...
v1_5_0/CDT-requestPrimitive-v1_5_0.xsd
View file @
f4f23f04
...
...
@@ -38,13 +38,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- parameter "To" -->
<xs:element
name=
"to"
type=
"xs:anyURI"
minOccurs=
"1"
/>
<!-- parameter "From" -->
<xs:element
name=
"from"
type=
"m2m:ID"
minOccurs=
"
1
"
/>
<xs:element
name=
"from"
type=
"m2m:ID"
minOccurs=
"
0
"
/>
<!-- parameter "Request Identifier" -->
<xs:element
name=
"requestIdentifier"
type=
"m2m:requestID"
minOccurs=
"1"
/>
<!-- parameter "ResourceType" -->
<xs:element
name=
"resourceType"
type=
"m2m:resourceType"
minOccurs=
"0"
/>
<!-- parameter "Name" -->
<xs:element
name=
"name"
type=
"xs:NCName"
minOccurs=
"0"
/>
<!-- parameter "Content" -->
<xs:element
name=
"primitiveContent"
type=
"m2m:primitiveContent"
minOccurs=
"0"
/>
<!-- parameter "Role" -->
...
...
v2_3_0/CDT-AE-v2_3_0.xsd
View file @
f4f23f04
...
...
@@ -48,6 +48,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element
name=
"ontologyRef"
type=
"xs:anyURI"
minOccurs=
"0"
/>
<xs:element
name=
"nodeLink"
type=
"xs:anyURI"
minOccurs=
"0"
/>
<xs:element
name=
"requestReachability"
type=
"xs:boolean"
/>
<xs:element
name=
"contentSerialization"
type=
"m2m:serializations"
minOccurs=
"0"
/>
<!-- Child Resources -->
<xs:choice
minOccurs=
"0"
maxOccurs=
"1"
>
...
...
@@ -81,6 +82,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element
name=
"ontologyRef"
type=
"xs:anyURI"
minOccurs=
"0"
/>
<xs:element
name=
"nodeLink"
type=
"xs:anyURI"
minOccurs=
"0"
/>
<xs:element
name=
"requestReachability"
type=
"xs:boolean"
minOccurs=
"0"
/>
<xs:element
name=
"contentSerialization"
type=
"m2m:serializations"
minOccurs=
"0"
/>
<!-- Child Resources -->
<xs:choice
minOccurs=
"0"
maxOccurs=
"1"
>
...
...
v2_3_0/CDT-commonTypes-v2_3_0.xsd
View file @
f4f23f04
...
...
@@ -136,10 +136,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
<!--Format is YYYYMMDDThhmmss with no punctuation
-->
<!--Format is YYYYMMDDThhmmss,ssssss with optional up to 6 digits of fractional seconds
-->
<xs:simpleType
name=
"timestamp"
>
<xs:restriction
base=
"xs:string"
>
<xs:pattern
value=
"\d{4}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|30|31)T([01]\d|2[0-3])[0-5]\d[0-5]\d"
></xs:pattern>
<xs:pattern
value=
"\d{4}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|30|31)T([01]\d|2[0-3])[0-5]\d[0-5]\d
(,\d{1,6})?
"
></xs:pattern>
</xs:restriction>
</xs:simpleType>
...
...
@@ -163,6 +163,26 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:pattern
value=
"[\w/!#$^_.+&\-]+"
/>
</xs:restriction>
</xs:simpleType>
<!-- auxiliary data type required to define "serializations" below -->
<xs:simpleType
name=
"permittedMediaTypes"
>
<xs:restriction
base=
"m2m:typeOfContent"
>
<xs:enumeration
value=
"application/xml"
/>
<xs:enumeration
value=
"application/json"
/>
</xs:restriction>
</xs:simpleType>
<!-- "serializations" data type is a list of permitted media types as defined above -->
<xs:simpleType
name=
"serializations"
>
<xs:restriction>
<xs:simpleType>
<xs:list
itemType=
"m2m:permittedMediaTypes"
/>
</xs:simpleType>
<xs:minLength
value=
"1"
/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType
name=
"contentInfo"
>
<xs:restriction
base=
"xs:string"
>
...
...
@@ -454,12 +474,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleContent>
</xs:complexType>
<xs:complexType
name=
"responseTypeInfo"
>
<xs:sequence>
<xs:element
name=
"responseTypeValue"
type=
"m2m:responseType"
/>
<xs:element
name=
"notificationURI"
type=
"xs:anyURI"
minOccurs=
"0"
maxOccurs=
"unbounded"
/>
</xs:sequence>
</xs:complexType>
<xs:complexType
name=
"responseTypeInfo"
>
<xs:sequence>
<xs:element
name=
"responseTypeValue"
type=
"m2m:responseType"
/>
<xs:element
name=
"notificationURI"
>
<xs:simpleType>
<xs:restriction>
<xs:simpleType>
<xs:list
itemType=
"xs:anyURI"
/>
</xs:simpleType>
<xs:minLength
value=
"0"
/>
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
<!-- m2m:rateLimit is in the Subscription xsd file -->
...
...
v2_3_0/CDT-enumerationTypes-v2_3_0.xsd
View file @
f4f23f04
...
...
@@ -256,7 +256,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- NO_PRIVILEGE -->
<xs:enumeration
value=
"5105"
/>
<!-- ALREADY_EXISTS -->
<xs:enumeration
value=
"5106"
/>
<xs:enumeration
value=
"5106"
/>
<!-- NOT_ACCEPTABLE -->
<xs:enumeration
value=
"5107"
/>
<!-- TARGET_NOT_SUBSCRIBABLE -->
<xs:enumeration
value=
"5203"
/>
<!-- SUBSCRIPTION_VERIFICATION_INITIATION_FAILED -->
...
...
@@ -533,7 +535,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType
name=
"notificationEventType"
>
<xs:annotation>
<xs:documentation>
Used in the notificationEventType element of eventNotificationCriteria attribute of subscruiption resource
</xs:documentation>
<xs:documentation>
Used in the notificationEventType element of eventNotificationCriteria attribute of subscription resource
and in the Notification data object
</xs:documentation>
</xs:annotation>
<xs:restriction
base=
"xs:integer"
>
<!-- Update of Resource -->
...
...
v2_3_0/CDT-group-v2_3_0.xsd
View file @
f4f23f04
...
...
@@ -39,8 +39,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:sequence>
<xs:element
name=
"creator"
type=
"m2m:ID"
minOccurs=
"0"
/>
<xs:element
name=
"memberType"
type=
"m2m:memberType"
/>
<xs:element
name=
"currentNrOfMembers"
type=
"xs:
nonNega
tiveInteger"
/>
<xs:element
name=
"maxNrOfMembers"
type=
"xs:
nonNega
tiveInteger"
/>
<xs:element
name=
"currentNrOfMembers"
type=
"xs:
posi
tiveInteger"
/>
<xs:element
name=
"maxNrOfMembers"
type=
"xs:
posi
tiveInteger"
/>
<xs:element
name=
"memberIDs"
type=
"m2m:listOfURIs"
/>
<xs:element
name=
"membersAccessControlPolicyIDs"
type=
"m2m:listOfURIs"
minOccurs=
"0"
/>
<xs:element
name=
"memberTypeValidated"
type=
"xs:boolean"
/>
...
...
@@ -68,8 +68,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:sequence>
<xs:element
name=
"memberType"
type=
"m2m:memberType"
minOccurs=
"0"
/>
<xs:element
name=
"currentNrOfMembers"
type=
"xs:
nonNega
tiveInteger"
minOccurs=
"0"
/>
<xs:element
name=
"maxNrOfMembers"
type=
"xs:
nonNega
tiveInteger"
minOccurs=
"0"
/>
<xs:element
name=
"currentNrOfMembers"
type=
"xs:
posi
tiveInteger"
minOccurs=
"0"
/>
<xs:element
name=
"maxNrOfMembers"
type=
"xs:
posi
tiveInteger"
minOccurs=
"0"
/>
<xs:element
name=
"memberIDs"
type=
"m2m:listOfURIs"
minOccurs=
"0"
/>
<xs:element
name=
"membersAccessControlPolicyIDs"
type=
"m2m:listOfURIs"
minOccurs=
"0"
/>
<xs:element
name=
"memberTypeValidated"
type=
"xs:boolean"
minOccurs=
"0"
/>
...
...
v2_3_0/CDT-notification-v2_3_0.xsd
View file @
f4f23f04
...
...
@@ -52,6 +52,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element
name=
"notificationEventType"
type=
"m2m:notificationEventType"
minOccurs=
"0"
/>
</xs:sequence>
</xs:complexType>
</xs:element>
...
...
v2_3_0/CDT-requestPrimitive-v2_3_0.xsd
View file @
f4f23f04
...
...
@@ -38,13 +38,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- parameter "To" -->
<xs:element
name=
"to"
type=
"xs:anyURI"
minOccurs=
"1"
/>
<!-- parameter "From" -->
<xs:element
name=
"from"
type=
"m2m:ID"
minOccurs=
"
1
"
/>
<xs:element
name=
"from"
type=
"m2m:ID"
minOccurs=
"
0
"
/>
<!-- parameter "Request Identifier" -->
<xs:element
name=
"requestIdentifier"
type=
"m2m:requestID"
minOccurs=
"1"
/>
<!-- parameter "ResourceType" -->
<xs:element
name=
"resourceType"
type=
"m2m:resourceType"
minOccurs=
"0"
/>
<!-- parameter "Name" -->
<xs:element
name=
"name"
type=
"xs:NCName"
minOccurs=
"0"
/>
<!-- parameter "Content" -->
<xs:element
name=
"primitiveContent"
type=
"m2m:primitiveContent"
minOccurs=
"0"
/>
<!-- parameter "Role" -->
...
...
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