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
0f85798e
Commit
0f85798e
authored
Jan 28, 2015
by
Wolfgang Granzow
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
final updates befor PRO#15.1 call
parent
47139121
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
11 deletions
+3
-11
CDT-accessControlPolicy-v0_8_0.xsd
CDT-accessControlPolicy-v0_8_0.xsd
+1
-9
CDT-commonTypes-v0_8_0.xsd
CDT-commonTypes-v0_8_0.xsd
+2
-2
No files found.
CDT-accessControlPolicy-v0_8_0.xsd
View file @
0f85798e
...
...
@@ -74,16 +74,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
<<<<<<
< HEAD
<!--
TODO:
1)
final
decision:
Should
some
or
all
of
the
data
types
defined
below
go
into
CDT-Common
Types
(and
"m2m:accessControlOperations"
into
CDT-Enumerations)
?
2)
define
short
names
for
the
elements
of
insetOfAcrs
(CR
to
TS-0004
for
next
PRO
WG
meeting)
accessControlRule,
accessControlOriginators,
accessControlOperations
accessControlContexts,
accessControlWindow,
accessControlIpAddresses,
ipv4Addresses,
ipv6Addresses,
accessControlLocationRegion,
countryCode,
circRegion"
--
>
=======
<!-- TODO: define short names for "setOfAcrs" and all its elements names (CR to TS-0004 for next PRO WG meeting) -->
>>>>>>> f4a7bf5333d1229c13e208e4b0f3c3eb485aca9b
<xs:complexType
name=
"setOfAcrs"
>
<xs:sequence>
...
...
CDT-commonTypes-v0_8_0.xsd
View file @
0f85798e
...
...
@@ -80,7 +80,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType
name=
"listOfM2MID"
>
<xs:list
itemType=
"m2m:ID"
/>
</xs:simpleType>
<!-- auxiliary data type required to define "listOflongMin-1" below -->
<xs:simpleType
name=
"longMin-1"
>
<xs:restriction
base=
"xs:long"
>
...
...
@@ -235,7 +235,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element
name=
"resultExpirationTimestamp"
type=
"m2m:timestamp"
minOccurs=
"0"
/>
<xs:element
name=
"operationalExecutionTime"
type=
"m2m:timestamp"
minOccurs=
"0"
/>
<xs:element
name=
"responseType"
type=
"m2m:responseType"
minOccurs=
"0"
/>
<xs:element
name=
"res
ponse
Persistence"
type=
"m2m:timestamp"
minOccurs=
"0"
/>
<xs:element
name=
"res
ult
Persistence"
type=
"m2m:timestamp"
minOccurs=
"0"
/>
<xs:element
name=
"resultContent"
type=
"m2m:resultContent"
minOccurs=
"0"
/>
<xs:element
name=
"eventCategory"
minOccurs=
"0"
>
<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