resource: Sync CBOR files for examples 49/21849/6
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Wed, 9 Aug 2017 11:16:40 +0000 (13:16 +0200)
committerDan Mihai <Daniel.Mihai@microsoft.com>
Mon, 14 Aug 2017 23:38:10 +0000 (23:38 +0000)
To avoid local changes on build,
let's commit the updated .dat files (using json2cbor),

Reminding, It's developer dutty to commit those files on each changes
on json source or any change that produce a different result.
This way we're not leaving inconsistant binary files in tree.

JSON file was also converted to UNIX format

Note: those files may need to be updated to support current ACL
(and commited by security team, check status of json and dat files)

Bug: https://jira.iotivity.org/browse/IOT-2310
Change-Id: If307ffb75e8ad39cd2b547f48209fa9dc0b420e7
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21849
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
resource/examples/light_introspection.json
resource/examples/oic_svr_db_client.dat
resource/examples/oic_svr_db_client.json
resource/examples/oic_svr_db_client_directpairing.dat
resource/examples/oic_svr_db_client_directpairing.json
resource/examples/oic_svr_db_server.dat
resource/examples/oic_svr_db_server.json

index baab37f..b524478 100644 (file)
-{\r
-    "swagger": "2.0",\r
-    "info": {\r
-      "title": "my_example_device",\r
-      "version": "my device version"\r
-    },\r
-\r
-\r
-    "schemes": [\r
-        "http"\r
-    ],\r
-    "consumes": [\r
-        "application/json"\r
-    ],\r
-    "produces": [\r
-        "application/json"\r
-    ],\r
-    "paths": {\r
-       "/switch": {\r
-\r
-          "get": {\r
-\r
-\r
-            "parameters": [\r
-               {\r
-                 "name": "if",\r
-                 "in": "query",\r
-                 "description": "",\r
-                 "enum": [ "oic.if.a","oic.if.baseline" ],\r
-\r
-                 "type": "string"\r
-                }\r
-            ],\r
-            "responses": {\r
-              "200" : {\r
-                  "description" : "",\r
-                  "schema" :\r
-                  {\r
-                    "$ref": "#/definitions/BinarySwitch"\r
-                  }\r
-               }\r
-            }\r
-\r
-           },\r
-\r
-          "post": {\r
-\r
-\r
-            "parameters": [\r
-               {\r
-                 "name": "if",\r
-                 "in": "query",\r
-                 "description": "",\r
-                 "enum": [ "oic.if.a","oic.if.baseline" ],\r
-\r
-                 "type": "string"\r
-                }\r
-                 ,{\r
-                  "name": "body",\r
-                  "in": "body",\r
-                  "required": false,\r
-                   "schema" :\r
-                  {\r
-                    "$ref": "#/definitions/BinarySwitch"\r
-                  }\r
-\r
-                }\r
-            ],\r
-            "responses": {\r
-              "200" : {\r
-                  "description" : "",\r
-                   "schema" :\r
-                  {\r
-                    "$ref": "#/definitions/BinarySwitch"\r
-                  }\r
-\r
-               }\r
-            }\r
-          }\r
-        },\r
-       "/brightness": {\r
-\r
-          "get": {\r
-\r
-\r
-            "parameters": [\r
-               {\r
-                 "name": "if",\r
-                 "in": "query",\r
-                 "description": "",\r
-                 "enum": [ "oic.if.a","oic.if.baseline" ],\r
-\r
-                 "type": "string"\r
-                }\r
-            ],\r
-            "responses": {\r
-              "200" : {\r
-                  "description" : "",\r
-                 "schema" :\r
-                  {\r
-                    "$ref": "#/definitions/Brightness"\r
-                  }\r
-               }\r
-            }\r
-\r
-           },\r
-\r
-          "post": {\r
-\r
-\r
-            "parameters": [\r
-               {\r
-                 "name": "if",\r
-                 "in": "query",\r
-                 "description": "",\r
-                 "enum": [ "oic.if.a","oic.if.baseline" ],\r
-\r
-                 "type": "string"\r
-                }\r
-                 ,{\r
-                  "name": "body",\r
-                  "in": "body",\r
-                  "required": false,\r
-                 "schema" :\r
-                  {\r
-                    "$ref": "#/definitions/Brightness"\r
-                  }\r
-                }\r
-            ],\r
-            "responses": {\r
-              "200" : {\r
-                  "description" : "",\r
-                 "schema" :\r
-                  {\r
-                    "$ref": "#/definitions/Brightness"\r
-                  }\r
-\r
-               }\r
-            }\r
-\r
-          }\r
-        }\r
-    },\r
-    "definitions":\r
-    {\r
-        "BinarySwitch": {\r
-           "type": "object",\r
-           "required": [\r
-             "id"\r
-           ],\r
-           "properties":  {\r
-               "value": {\r
-                  "type": "boolean",\r
-                  "description": "Status of the switch"\r
-                },\r
-                "rt": {\r
-                "type": "array",\r
-                "items" : [\r
-                  {\r
-                    "type" : "string",\r
-                    "maxLength": 64\r
-                  }\r
-                ],\r
-                "minItems" : 1,\r
-                "description": "Resource Type",\r
-                "readOnly" : true,\r
-                "default" : [ "oic.r.switch.binary" ]\r
-                },\r
-                "if": {\r
-                    "type": "array",\r
-                    "description": "The interface set supported by this resource",\r
-                    "readOnly" : true,\r
-                    "items": {\r
-                        "type": "string",\r
-                        "enum": [\r
-                            "oic.if.baseline",\r
-                            "oic.if.a"\r
-                        ]\r
-                    }\r
-                },\r
-                "p": {\r
-                    "type": "integer",\r
-                    "description": "Bitmap indicating observable and discoverable",\r
-                    "readOnly" : true\r
-                },\r
-                "n": {\r
-                    "type": "string",\r
-                    "description": "Friendly name of the resource",\r
-                    "readOnly" : true\r
-                },\r
-                "id": {\r
-                    "type": "string",\r
-                    "description": "Instance ID of this specific resource",\r
-                    "readOnly" : true\r
-                },\r
-                "range": {\r
-                    "type": "array",\r
-                    "description": "The valid range for the value Property",\r
-                    "readOnly" : true,\r
-                    "minItems": 2,\r
-                    "maxItems": 2,\r
-                    "items": {\r
-                        "type": "number"\r
-                    }\r
-                }\r
-            }\r
-        },\r
-        "Brightness": {\r
-           "type": "object",\r
-           "required": [\r
-             "id"\r
-           ],\r
-           "properties":  {\r
-               "brighness": {\r
-                  "type": "integer",\r
-                  "description": "Current sensed or set value for Brightness"\r
-                },\r
-                "rt": {\r
-                "type": "array",\r
-                "items" : [\r
-                  {\r
-                    "type" : "string",\r
-                    "maxLength": 64\r
-                  }\r
-                ],\r
-                "minItems" : 1,\r
-                "description": "Resource Type",\r
-                "readOnly" : true,\r
-                "default" : [ "oic.r.light.brightness" ]\r
-                },\r
-                "if": {\r
-                    "type": "array",\r
-                    "description": "The interface set supported by this resource",\r
-                    "readOnly" : true,\r
-                    "items": {\r
-                        "type": "string",\r
-                        "enum": [\r
-                            "oic.if.baseline",\r
-                            "oic.if.a"\r
-                        ]\r
-                    }\r
-                },\r
-                "p": {\r
-                    "type": "integer",\r
-                    "description": "Bitmap indicating observable and discoverable",\r
-                    "readOnly" : true\r
-                },\r
-                "n": {\r
-                    "type": "string",\r
-                    "description": "Friendly name of the resource",\r
-                    "readOnly" : true\r
-                },\r
-                "id": {\r
-                    "type": "string",\r
-                    "description": "Instance ID of this specific resource",\r
-                    "readOnly" : true\r
-                },\r
-                "range": {\r
-                    "type": "array",\r
-                    "description": "The valid range for the value Property",\r
-                    "readOnly" : true,\r
-                    "minItems": 2,\r
-                    "maxItems": 2,\r
-                    "items": {\r
-                        "type": "number"\r
-                    }\r
-                }\r
-            }\r
-        }\r
-    }\r
-\r
-}\r
+{
+    "swagger": "2.0",
+    "info": {
+      "title": "my_example_device",
+      "version": "my device version"
+    },
+
+
+    "schemes": [
+        "http"
+    ],
+    "consumes": [
+        "application/json"
+    ],
+    "produces": [
+        "application/json"
+    ],
+    "paths": {
+       "/switch": {
+
+          "get": {
+
+
+            "parameters": [
+               {
+                 "name": "if",
+                 "in": "query",
+                 "description": "",
+                 "enum": [ "oic.if.a","oic.if.baseline" ],
+
+                 "type": "string"
+                }
+            ],
+            "responses": {
+              "200" : {
+                  "description" : "",
+                  "schema" :
+                  {
+                    "$ref": "#/definitions/BinarySwitch"
+                  }
+               }
+            }
+
+           },
+
+          "post": {
+
+
+            "parameters": [
+               {
+                 "name": "if",
+                 "in": "query",
+                 "description": "",
+                 "enum": [ "oic.if.a","oic.if.baseline" ],
+
+                 "type": "string"
+                }
+                 ,{
+                  "name": "body",
+                  "in": "body",
+                  "required": false,
+                   "schema" :
+                  {
+                    "$ref": "#/definitions/BinarySwitch"
+                  }
+
+                }
+            ],
+            "responses": {
+              "200" : {
+                  "description" : "",
+                   "schema" :
+                  {
+                    "$ref": "#/definitions/BinarySwitch"
+                  }
+
+               }
+            }
+          }
+        },
+       "/brightness": {
+
+          "get": {
+
+
+            "parameters": [
+               {
+                 "name": "if",
+                 "in": "query",
+                 "description": "",
+                 "enum": [ "oic.if.a","oic.if.baseline" ],
+
+                 "type": "string"
+                }
+            ],
+            "responses": {
+              "200" : {
+                  "description" : "",
+                 "schema" :
+                  {
+                    "$ref": "#/definitions/Brightness"
+                  }
+               }
+            }
+
+           },
+
+          "post": {
+
+
+            "parameters": [
+               {
+                 "name": "if",
+                 "in": "query",
+                 "description": "",
+                 "enum": [ "oic.if.a","oic.if.baseline" ],
+
+                 "type": "string"
+                }
+                 ,{
+                  "name": "body",
+                  "in": "body",
+                  "required": false,
+                 "schema" :
+                  {
+                    "$ref": "#/definitions/Brightness"
+                  }
+                }
+            ],
+            "responses": {
+              "200" : {
+                  "description" : "",
+                 "schema" :
+                  {
+                    "$ref": "#/definitions/Brightness"
+                  }
+
+               }
+            }
+
+          }
+        }
+    },
+    "definitions":
+    {
+        "BinarySwitch": {
+           "type": "object",
+           "required": [
+             "id"
+           ],
+           "properties":  {
+               "value": {
+                  "type": "boolean",
+                  "description": "Status of the switch"
+                },
+                "rt": {
+                "type": "array",
+                "items" : [
+                  {
+                    "type" : "string",
+                    "maxLength": 64
+                  }
+                ],
+                "minItems" : 1,
+                "description": "Resource Type",
+                "readOnly" : true,
+                "default" : [ "oic.r.switch.binary" ]
+                },
+                "if": {
+                    "type": "array",
+                    "description": "The interface set supported by this resource",
+                    "readOnly" : true,
+                    "items": {
+                        "type": "string",
+                        "enum": [
+                            "oic.if.baseline",
+                            "oic.if.a"
+                        ]
+                    }
+                },
+                "p": {
+                    "type": "integer",
+                    "description": "Bitmap indicating observable and discoverable",
+                    "readOnly" : true
+                },
+                "n": {
+                    "type": "string",
+                    "description": "Friendly name of the resource",
+                    "readOnly" : true
+                },
+                "id": {
+                    "type": "string",
+                    "description": "Instance ID of this specific resource",
+                    "readOnly" : true
+                },
+                "range": {
+                    "type": "array",
+                    "description": "The valid range for the value Property",
+                    "readOnly" : true,
+                    "minItems": 2,
+                    "maxItems": 2,
+                    "items": {
+                        "type": "number"
+                    }
+                }
+            }
+        },
+        "Brightness": {
+           "type": "object",
+           "required": [
+             "id"
+           ],
+           "properties":  {
+               "brighness": {
+                  "type": "integer",
+                  "description": "Current sensed or set value for Brightness"
+                },
+                "rt": {
+                "type": "array",
+                "items" : [
+                  {
+                    "type" : "string",
+                    "maxLength": 64
+                  }
+                ],
+                "minItems" : 1,
+                "description": "Resource Type",
+                "readOnly" : true,
+                "default" : [ "oic.r.light.brightness" ]
+                },
+                "if": {
+                    "type": "array",
+                    "description": "The interface set supported by this resource",
+                    "readOnly" : true,
+                    "items": {
+                        "type": "string",
+                        "enum": [
+                            "oic.if.baseline",
+                            "oic.if.a"
+                        ]
+                    }
+                },
+                "p": {
+                    "type": "integer",
+                    "description": "Bitmap indicating observable and discoverable",
+                    "readOnly" : true
+                },
+                "n": {
+                    "type": "string",
+                    "description": "Friendly name of the resource",
+                    "readOnly" : true
+                },
+                "id": {
+                    "type": "string",
+                    "description": "Instance ID of this specific resource",
+                    "readOnly" : true
+                },
+                "range": {
+                    "type": "array",
+                    "description": "The valid range for the value Property",
+                    "readOnly" : true,
+                    "minItems": 2,
+                    "maxItems": 2,
+                    "items": {
+                        "type": "number"
+                    }
+                }
+            }
+        }
+    }
+
+}
index 184e10f..dbcb2b2 100644 (file)
Binary files a/resource/examples/oic_svr_db_client.dat and b/resource/examples/oic_svr_db_client.dat differ
index ef2ce9a..37729c4 100644 (file)
@@ -1,90 +1,90 @@
-{\r
-    "acl": {\r
-        "aclist": {\r
-            "aces": [\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/oic/res",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.res"],\r
-                            "if": ["oic.if.ll"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/d",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.d"],\r
-                            "if": ["oic.if.baseline", "oic.if.r"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/p",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.p"],\r
-                            "if": ["oic.if.baseline", "oic.if.r"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/sec/acl",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.acl"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                    "permission": 2\r
-                },\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/oic/sec/doxm",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.doxm"],\r
-                            "if": ["oic.if.baseline"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/sec/pstat",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.pstat"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                    "permission": 2\r
-                }\r
-            ]\r
-        },\r
-        "rowneruuid" : "32323232-3232-3232-3232-323232323232"\r
-    },\r
-    "pstat": {\r
-        "dos": {"s": 3, "p": false},\r
-        "isop": true,\r
-        "deviceuuid": "32323232-3232-3232-3232-323232323232",\r
-        "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
-        "cm": 0,\r
-        "tm": 0,\r
-        "om": 4,\r
-        "sm": 4\r
-        },\r
-    "doxm": {\r
-        "oxms": [0],\r
-        "oxmsel": 0,\r
-        "sct": 1,\r
-        "owned": true,\r
-        "deviceuuid": "32323232-3232-3232-3232-323232323232",\r
-        "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
-        "rowneruuid": "32323232-3232-3232-3232-323232323232"\r
-    },\r
-    "cred": {\r
-        "creds": [\r
-            {\r
-                "credid": 1,\r
-                "subjectuuid": "31313131-3131-3131-3131-313131313131",\r
-                "credtype": 1,\r
-                "privatedata": {\r
-                    "data": "AAAAAAAAAAAAAAAA",\r
-                    "encoding": "oic.sec.encoding.raw"\r
-                }\r
-            }\r
-        ],\r
-        "rowneruuid": "32323232-3232-3232-3232-323232323232"\r
-    }\r
+{
+    "acl": {
+        "aclist": {
+            "aces": [
+                {
+                    "subjectuuid": "*",
+                    "resources": [
+                        {
+                            "href": "/oic/res",
+                            "rel": "",
+                            "rt": ["oic.wk.res"],
+                            "if": ["oic.if.ll"]
+                        },
+                        {
+                            "href": "/oic/d",
+                            "rel": "",
+                            "rt": ["oic.wk.d"],
+                            "if": ["oic.if.baseline", "oic.if.r"]
+                        },
+                        {
+                            "href": "/oic/p",
+                            "rel": "",
+                            "rt": ["oic.wk.p"],
+                            "if": ["oic.if.baseline", "oic.if.r"]
+                        },
+                        {
+                            "href": "/oic/sec/acl",
+                            "rel": "",
+                            "rt": ["oic.r.acl"],
+                            "if": ["oic.if.baseline"]
+                        }
+                    ],
+                    "permission": 2
+                },
+                {
+                    "subjectuuid": "*",
+                    "resources": [
+                        {
+                            "href": "/oic/sec/doxm",
+                            "rel": "",
+                            "rt": ["oic.r.doxm"],
+                            "if": ["oic.if.baseline"]
+                        },
+                        {
+                            "href": "/oic/sec/pstat",
+                            "rel": "",
+                            "rt": ["oic.r.pstat"],
+                            "if": ["oic.if.baseline"]
+                        }
+                    ],
+                    "permission": 2
+                }
+            ]
+        },
+        "rowneruuid" : "32323232-3232-3232-3232-323232323232"
+    },
+    "pstat": {
+        "dos": {"s": 3, "p": false},
+        "isop": true,
+        "deviceuuid": "32323232-3232-3232-3232-323232323232",
+        "rowneruuid": "32323232-3232-3232-3232-323232323232",
+        "cm": 0,
+        "tm": 0,
+        "om": 4,
+        "sm": 4
+        },
+    "doxm": {
+        "oxms": [0],
+        "oxmsel": 0,
+        "sct": 1,
+        "owned": true,
+        "deviceuuid": "32323232-3232-3232-3232-323232323232",
+        "devowneruuid": "32323232-3232-3232-3232-323232323232",
+        "rowneruuid": "32323232-3232-3232-3232-323232323232"
+    },
+    "cred": {
+        "creds": [
+            {
+                "credid": 1,
+                "subjectuuid": "31313131-3131-3131-3131-313131313131",
+                "credtype": 1,
+                "privatedata": {
+                    "data": "AAAAAAAAAAAAAAAA",
+                    "encoding": "oic.sec.encoding.raw"
+                }
+            }
+        ],
+        "rowneruuid": "32323232-3232-3232-3232-323232323232"
+    }
 }
\ No newline at end of file
index 94c2d67..ad945c8 100644 (file)
Binary files a/resource/examples/oic_svr_db_client_directpairing.dat and b/resource/examples/oic_svr_db_client_directpairing.dat differ
index e51bf08..a0c4dd6 100644 (file)
@@ -1,76 +1,76 @@
-{\r
-    "acl": {\r
-        "aclist": {\r
-            "aces": [\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/oic/res",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.res"],\r
-                            "if": ["oic.if.ll"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/d",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.d"],\r
-                            "if": ["oic.if.baseline", "oic.if.r"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/p",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.p"],\r
-                            "if": ["oic.if.baseline", "oic.if.r"]\r
-                        }\r
-                    ],\r
-                    "permission": 2\r
-                },\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/oic/sec/doxm",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.doxm"],\r
-                            "if": ["oic.if.baseline"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/sec/pstat",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.pstat"],\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
-                        }\r
-                    ],\r
-                    "permission": 6\r
-                }\r
-            ]\r
-        },\r
-        "rowneruuid" : "64706169-7269-6e67-4465-765555494430"\r
-    },\r
-    "pstat": {\r
-        "dos": {"s": 1, "p": false},\r
-        "isop": false,\r
-        "deviceuuid": "64706169-7269-6e67-4465-765555494430",\r
-        "rowneruuid": "64706169-7269-6e67-4465-765555494430",\r
-        "cm": 2,\r
-        "tm": 0,\r
-        "om": 4,\r
-        "sm": 4\r
-        },\r
-    "doxm": {\r
-        "oxms": [0],\r
-        "oxmsel": 0,\r
-        "sct": 1,\r
-        "owned": false,\r
-        "deviceuuid": "64706169-7269-6e67-4465-765555494430",\r
-        "devowneruuid": "",\r
-        "rowneruuid": "64706169-7269-6e67-4465-765555494430"\r
-    }\r
-}\r
+{
+    "acl": {
+        "aclist": {
+            "aces": [
+                {
+                    "subjectuuid": "*",
+                    "resources": [
+                        {
+                            "href": "/oic/res",
+                            "rel": "",
+                            "rt": ["oic.wk.res"],
+                            "if": ["oic.if.ll"]
+                        },
+                        {
+                            "href": "/oic/d",
+                            "rel": "",
+                            "rt": ["oic.wk.d"],
+                            "if": ["oic.if.baseline", "oic.if.r"]
+                        },
+                        {
+                            "href": "/oic/p",
+                            "rel": "",
+                            "rt": ["oic.wk.p"],
+                            "if": ["oic.if.baseline", "oic.if.r"]
+                        }
+                    ],
+                    "permission": 2
+                },
+                {
+                    "subjectuuid": "*",
+                    "resources": [
+                        {
+                            "href": "/oic/sec/doxm",
+                            "rel": "",
+                            "rt": ["oic.r.doxm"],
+                            "if": ["oic.if.baseline"]
+                        },
+                        {
+                            "href": "/oic/sec/pstat",
+                            "rel": "",
+                            "rt": ["oic.r.pstat"],
+                            "if": ["oic.if.baseline"]
+                        },
+                        {
+                            "href": "/oic/sec/cred",
+                            "rel": "",
+                            "rt": ["oic.r.cred"],
+                            "if": ["oic.if.baseline"]
+                        }
+                    ],
+                    "permission": 6
+                }
+            ]
+        },
+        "rowneruuid" : "64706169-7269-6e67-4465-765555494430"
+    },
+    "pstat": {
+        "dos": {"s": 1, "p": false},
+        "isop": false,
+        "deviceuuid": "64706169-7269-6e67-4465-765555494430",
+        "rowneruuid": "64706169-7269-6e67-4465-765555494430",
+        "cm": 2,
+        "tm": 0,
+        "om": 4,
+        "sm": 4
+        },
+    "doxm": {
+        "oxms": [0],
+        "oxmsel": 0,
+        "sct": 1,
+        "owned": false,
+        "deviceuuid": "64706169-7269-6e67-4465-765555494430",
+        "devowneruuid": "",
+        "rowneruuid": "64706169-7269-6e67-4465-765555494430"
+    }
+}
index 5f303de..1e48ddc 100644 (file)
Binary files a/resource/examples/oic_svr_db_server.dat and b/resource/examples/oic_svr_db_server.dat differ
index 2d43654..992f199 100644 (file)
-{\r
-    "acl": {\r
-        "aclist": {\r
-            "aces": [\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/oic/res",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.res"],\r
-                            "if": ["oic.if.ll"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/d",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.d"],\r
-                            "if": ["oic.if.baseline", "oic.if.r"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/p",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.p"],\r
-                            "if": ["oic.if.baseline", "oic.if.r"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/sec/acl",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.acl"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                    "permission": 2\r
-                },\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/oic/sec/doxm",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.doxm"],\r
-                            "if": ["oic.if.baseline"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/sec/pstat",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.pstat"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                    "permission": 2\r
-                },\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/a/light",\r
-                            "rel": "",\r
-                            "rt": ["oic.core"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                    "permission": 7\r
-                }\r
-            ]\r
-        },\r
-        "rowneruuid" : "31313131-3131-3131-3131-313131313131"\r
-    },\r
-    "pstat": {\r
-        "dos": {"s": 3, "p": false},\r
-        "isop": true,\r
-        "deviceuuid": "31313131-3131-3131-3131-313131313131",\r
-        "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
-        "cm": 0,\r
-        "tm": 0,\r
-        "om": 4,\r
-        "sm": 4\r
-        },\r
-    "doxm": {\r
-        "oxms": [0],\r
-        "oxmsel": 0,\r
-        "sct": 1,\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
-    },\r
-    "cred": {\r
-        "creds": [\r
-            {\r
-                "credid": 1,\r
-                "subjectuuid": "32323232-3232-3232-3232-323232323232",\r
-                "credtype": 1,\r
-                "privatedata": {\r
-                    "data": "AAAAAAAAAAAAAAAA",\r
-                    "encoding": "oic.sec.encoding.raw"\r
-                }\r
-            }\r
-        ],\r
-        "rowneruuid": "31313131-3131-3131-3131-313131313131"\r
-    }\r
+{
+    "acl": {
+        "aclist": {
+            "aces": [
+                {
+                    "subjectuuid": "*",
+                    "resources": [
+                        {
+                            "href": "/oic/res",
+                            "rel": "",
+                            "rt": ["oic.wk.res"],
+                            "if": ["oic.if.ll"]
+                        },
+                        {
+                            "href": "/oic/d",
+                            "rel": "",
+                            "rt": ["oic.wk.d"],
+                            "if": ["oic.if.baseline", "oic.if.r"]
+                        },
+                        {
+                            "href": "/oic/p",
+                            "rel": "",
+                            "rt": ["oic.wk.p"],
+                            "if": ["oic.if.baseline", "oic.if.r"]
+                        },
+                        {
+                            "href": "/oic/sec/acl",
+                            "rel": "",
+                            "rt": ["oic.r.acl"],
+                            "if": ["oic.if.baseline"]
+                        }
+                    ],
+                    "permission": 2
+                },
+                {
+                    "subjectuuid": "*",
+                    "resources": [
+                        {
+                            "href": "/oic/sec/doxm",
+                            "rel": "",
+                            "rt": ["oic.r.doxm"],
+                            "if": ["oic.if.baseline"]
+                        },
+                        {
+                            "href": "/oic/sec/pstat",
+                            "rel": "",
+                            "rt": ["oic.r.pstat"],
+                            "if": ["oic.if.baseline"]
+                        }
+                    ],
+                    "permission": 2
+                },
+                {
+                    "subjectuuid": "*",
+                    "resources": [
+                        {
+                            "href": "/a/light",
+                            "rel": "",
+                            "rt": ["oic.core"],
+                            "if": ["oic.if.baseline"]
+                        }
+                    ],
+                    "permission": 7
+                }
+            ]
+        },
+        "rowneruuid" : "31313131-3131-3131-3131-313131313131"
+    },
+    "pstat": {
+        "dos": {"s": 3, "p": false},
+        "isop": true,
+        "deviceuuid": "31313131-3131-3131-3131-313131313131",
+        "rowneruuid": "31313131-3131-3131-3131-313131313131",
+        "cm": 0,
+        "tm": 0,
+        "om": 4,
+        "sm": 4
+        },
+    "doxm": {
+        "oxms": [0],
+        "oxmsel": 0,
+        "sct": 1,
+        "owned": true,
+        "deviceuuid": "31313131-3131-3131-3131-313131313131",
+        "devowneruuid": "32323232-3232-3232-3232-323232323232",
+        "rowneruuid": "31313131-3131-3131-3131-313131313131"
+    },
+    "cred": {
+        "creds": [
+            {
+                "credid": 1,
+                "subjectuuid": "32323232-3232-3232-3232-323232323232",
+                "credtype": 1,
+                "privatedata": {
+                    "data": "AAAAAAAAAAAAAAAA",
+                    "encoding": "oic.sec.encoding.raw"
+                }
+            }
+        ],
+        "rowneruuid": "31313131-3131-3131-3131-313131313131"
+    }
 }
\ No newline at end of file