projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace : iotivity -> iotivity-sec
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
stack
/
samples
/
linux
/
secure
/
oic_svr_db_server.json
diff --git
a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
index
920c945
..
8d52f5c
100644
(file)
--- a/
resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
+++ b/
resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
@@
-8,50
+8,26
@@
{
\r
"href": "/oic/res",
\r
"rel": "",
\r
{
\r
"href": "/oic/res",
\r
"rel": "",
\r
- "rt":
""
,
\r
- "if":
""
\r
+ "rt":
["oic.wk.res"]
,
\r
+ "if":
["oic.if.ll"]
\r
},
\r
{
\r
"href": "/oic/d",
\r
"rel": "",
\r
},
\r
{
\r
"href": "/oic/d",
\r
"rel": "",
\r
- "rt":
""
,
\r
- "if":
""
\r
+ "rt":
["oic.wk.d"]
,
\r
+ "if":
["oic.if.baseline", "oic.if.r"]
\r
},
\r
{
\r
"href": "/oic/p",
\r
"rel": "",
\r
},
\r
{
\r
"href": "/oic/p",
\r
"rel": "",
\r
- "rt": "",
\r
- "if": ""
\r
- },
\r
- {
\r
- "href": "/oic/res/d",
\r
- "rel": "",
\r
- "rt": "",
\r
- "if": ""
\r
- },
\r
- {
\r
- "href": "/oic/res/types/d",
\r
- "rel": "",
\r
- "rt": "",
\r
- "if": ""
\r
- },
\r
- {
\r
- "href": "/oic/ad",
\r
- "rel": "",
\r
- "rt": "",
\r
- "if": ""
\r
+ "rt": ["oic.wk.p"],
\r
+ "if": ["oic.if.baseline", "oic.if.r"]
\r
},
\r
{
\r
"href": "/oic/sec/acl",
\r
"rel": "",
\r
},
\r
{
\r
"href": "/oic/sec/acl",
\r
"rel": "",
\r
- "rt": "",
\r
- "if": ""
\r
- },
\r
- {
\r
- "href": "/oic/sec/amacl",
\r
- "rel": "",
\r
- "rt": "",
\r
- "if": ""
\r
+ "rt": ["oic.r.acl"],
\r
+ "if": ["oic.if.baseline"]
\r
}
\r
],
\r
"permission": 2
\r
}
\r
],
\r
"permission": 2
\r
@@
-62,14
+38,14
@@
{
\r
"href": "/oic/sec/doxm",
\r
"rel": "",
\r
{
\r
"href": "/oic/sec/doxm",
\r
"rel": "",
\r
- "rt":
""
,
\r
- "if":
""
\r
- }
,
\r
+ "rt":
["oic.r.doxm"]
,
\r
+ "if":
["oic.if.baseline"]
\r
+ },
\r
{
\r
"href": "/oic/sec/pstat",
\r
"rel": "",
\r
{
\r
"href": "/oic/sec/pstat",
\r
"rel": "",
\r
- "rt":
""
,
\r
- "if":
""
\r
+ "rt":
["oic.r.pstat"]
,
\r
+ "if":
["oic.if.baseline"]
\r
}
\r
],
\r
"permission": 2
\r
}
\r
],
\r
"permission": 2
\r
@@
-78,33
+54,25
@@
"subjectuuid": "32323232-3232-3232-3232-323232323232",
\r
"resources": [
\r
{
\r
"subjectuuid": "32323232-3232-3232-3232-323232323232",
\r
"resources": [
\r
{
\r
- "href": "/oic/sec/acl",
\r
- "rel": "",
\r
- "rt": "",
\r
- "if": ""
\r
- } ,
\r
- {
\r
- "href": "/oic/sec/cred",
\r
+ "href": "*",
\r
"rel": "",
\r
"rel": "",
\r
- "rt":
""
,
\r
- "if":
""
\r
+ "rt":
["*"]
,
\r
+ "if":
["*"]
\r
}
\r
],
\r
}
\r
],
\r
- "permission":
8
\r
+ "permission":
7
\r
},
\r
{
\r
},
\r
{
\r
- "subjectuuid": "313
13131-3232-3232-3333-333334343434
",
\r
+ "subjectuuid": "313
93139-3139-3139-3139-313931393139
",
\r
"resources": [
\r
{
\r
"href": "/a/led",
\r
"rel": "",
\r
"resources": [
\r
{
\r
"href": "/a/led",
\r
"rel": "",
\r
- "rt":
""
,
\r
- "if":
""
\r
+ "rt":
["oic.core"]
,
\r
+ "if":
["oic.if.baseline"]
\r
}
\r
],
\r
}
\r
],
\r
- "permission": 6,
\r
- "period" : ["20150630T060000/20150630T220000", "20150630T060000/20150630T200000"],
\r
- "recurrence" : ["FREQ=DAILY; BYDAY=MO, WE, FR", "FREQ=DAILY; BYDAY=TU, TH; UNTIL=20160630"]
\r
+ "permission": 7
\r
},
\r
{
\r
"subjectuuid": "37373737-3737-3737-3737-373737373737",
\r
},
\r
{
\r
"subjectuuid": "37373737-3737-3737-3737-373737373737",
\r
@@
-112,13
+80,11
@@
{
\r
"href": "/a/led",
\r
"rel": "",
\r
{
\r
"href": "/a/led",
\r
"rel": "",
\r
- "rt":
""
,
\r
- "if":
""
\r
+ "rt":
["oic.core"]
,
\r
+ "if":
["oic.if.baseline"]
\r
}
\r
],
\r
}
\r
],
\r
- "permission": 6,
\r
- "period" : ["20150630T060000/20150630T220000"],
\r
- "recurrence" : ["FREQ=DAILY; UNTIL=20150630"]
\r
+ "permission": 6
\r
}
\r
]
\r
},
\r
}
\r
]
\r
},
\r
@@
-130,8
+96,8
@@
"rowneruuid": "31313131-3131-3131-3131-313131313131",
\r
"cm": 0,
\r
"tm": 0,
\r
"rowneruuid": "31313131-3131-3131-3131-313131313131",
\r
"cm": 0,
\r
"tm": 0,
\r
- "om":
3
,
\r
- "sm":
3
\r
+ "om":
4
,
\r
+ "sm":
4
\r
},
\r
"doxm": {
\r
"oxms": [0],
\r
},
\r
"doxm": {
\r
"oxms": [0],
\r
@@
-140,8
+106,7
@@
"owned": true,
\r
"deviceuuid": "31313131-3131-3131-3131-313131313131",
\r
"devowneruuid": "32323232-3232-3232-3232-323232323232",
\r
"owned": true,
\r
"deviceuuid": "31313131-3131-3131-3131-313131313131",
\r
"devowneruuid": "32323232-3232-3232-3232-323232323232",
\r
- "rowneruuid": "31313131-3131-3131-3131-313131313131",
\r
- "dpc": false
\r
+ "rowneruuid": "31313131-3131-3131-3131-313131313131"
\r
},
\r
"cred": {
\r
"creds": [
\r
},
\r
"cred": {
\r
"creds": [
\r