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
a5ebfcb
..
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
@@
-24,22
+24,10
@@
"if": ["oic.if.baseline", "oic.if.r"]
\r
},
\r
{
\r
"if": ["oic.if.baseline", "oic.if.r"]
\r
},
\r
{
\r
- "href": "/oic/ad",
\r
- "rel": "",
\r
- "rt": ["oic.wk.ad"],
\r
- "if": ["oic.if.baseline"]
\r
- },
\r
- {
\r
"href": "/oic/sec/acl",
\r
"rel": "",
\r
"rt": ["oic.r.acl"],
\r
"if": ["oic.if.baseline"]
\r
"href": "/oic/sec/acl",
\r
"rel": "",
\r
"rt": ["oic.r.acl"],
\r
"if": ["oic.if.baseline"]
\r
- },
\r
- {
\r
- "href": "/oic/sec/amacl",
\r
- "rel": "",
\r
- "rt": ["oic.r.amacl"],
\r
- "if": ["oic.if.baseline"]
\r
}
\r
],
\r
"permission": 2
\r
}
\r
],
\r
"permission": 2
\r
@@
-66,19
+54,13
@@
"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
+ "href": "
*
",
\r
"rel": "",
\r
"rel": "",
\r
- "rt": ["oic.r.acl"],
\r
- "if": ["oic.if.baseline"]
\r
- },
\r
- {
\r
- "href": "/oic/sec/cred",
\r
- "rel": "",
\r
- "rt": ["oic.r.cred"],
\r
- "if": ["oic.if.baseline"]
\r
+ "rt": ["*"],
\r
+ "if": ["*"]
\r
}
\r
],
\r
}
\r
],
\r
- "permission":
8
\r
+ "permission":
7
\r
},
\r
{
\r
"subjectuuid": "31393139-3139-3139-3139-313931393139",
\r
},
\r
{
\r
"subjectuuid": "31393139-3139-3139-3139-313931393139",
\r
@@
-90,7
+72,7
@@
"if": ["oic.if.baseline"]
\r
}
\r
],
\r
"if": ["oic.if.baseline"]
\r
}
\r
],
\r
- "permission":
6
\r
+ "permission":
7
\r
},
\r
{
\r
"subjectuuid": "37373737-3737-3737-3737-373737373737",
\r
},
\r
{
\r
"subjectuuid": "37373737-3737-3737-3737-373737373737",
\r
@@
-114,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
@@
-124,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
- "x.org.iotivity.dpc": false
\r
+ "rowneruuid": "31313131-3131-3131-3131-313131313131"
\r
},
\r
"cred": {
\r
"creds": [
\r
},
\r
"cred": {
\r
"creds": [
\r