Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
63401cf
Add the raml and json-schema files from the oic core spec.
stephanesan Feb 12, 2016
a34483c
dos2unix.
stephanesan Feb 12, 2016
e635f68
Changed the '©' in the JSON to 'Copyright (c)'.
stephanesan Feb 12, 2016
dfda502
Changed the '©' in the JSON to 'Copyright (c)'.
stephanesan Feb 12, 2016
63c40e4
oic.core resolve $ref.
stephanesan Feb 13, 2016
857e804
Merge pull request #1 from stephanesan/api_core
stephanesan Feb 13, 2016
0c13ff8
Refactoring work for adding directory structure to schemas.
stephanesan Mar 7, 2016
8c73c87
Refactor: continued teh rename *.json -> *-schema.json
stephanesan Mar 7, 2016
dd79a69
Also refactor id's that were not terminated with .json
stephanesan Mar 7, 2016
27c2fbb
Fix dual documentation declaration in rdpublish.raml.
stephanesan Mar 7, 2016
3f099d7
include legal notice from external file.
stephanesan Mar 8, 2016
7ba5cf3
repair rdpublish which was messed up with previous commit.
stephanesan Mar 8, 2016
e28a9e0
Test splitting legal content in seperate files.
stephanesan Mar 18, 2016
4b7c073
Implemented ocf lawyer's recommendation.
stephanesan Mar 22, 2016
c903c1e
Replace all OIC occurences by OCF in legal content.
stephanesan Mar 22, 2016
66b9872
All schemas id's include the 'schemas' folder and same document ref.
stephanesan Mar 24, 2016
424db30
Merge pull request #1 from stephanesan/refactor
stephanesan Mar 24, 2016
64fd9f0
Align schemas to OIC v1.1 changes
rabardini May 2, 2016
cd51efe
Merge pull request #2 from rabardini/refactor
stephanesan May 2, 2016
afe245e
Merge pull request #1 from openconnectivityfoundation/refactor
rabardini May 2, 2016
d70b817
Merge pull request #2 from rabardini/refactor
rabardini May 2, 2016
c74dc11
Merge pull request #3 from rabardini/master
stephanesan May 2, 2016
03ce288
v1.1.0
rabardini Jun 23, 2016
7d25b44
Merge remote-tracking branch 'refs/remotes/openconnectivityfoundation…
rabardini Jun 23, 2016
aeff95d
Merge pull request #4 from rabardini/master
stephanesan Jun 23, 2016
7134324
v1.1.0 - Added Pattern
rabardini Jul 8, 2016
add7b4c
Merge remote-tracking branch 'refs/remotes/openconnectivityfoundation…
rabardini Jul 8, 2016
6a02007
Merge pull request #5 from rabardini/master
rabardini Jul 8, 2016
df3b50f
v1.1.0 - Fixed pattern syntax for mndt property. Added format for all…
rabardini Jul 12, 2016
26780a7
v1.1.0 - Fixed pattern syntax for mndt property. Added format for all…
rabardini Jul 12, 2016
22d1117
Merge pull request #6 from rabardini/master
rabardini Jul 12, 2016
59f96f1
Add readOnly property where appropriate in the json schema's.
stephanesan Jul 22, 2016
4b100b4
Change the id to comply with the OCF API design guidelines.
stephanesan Aug 4, 2016
30ce83c
The json schema format uuid is not a valid schema definition.
stephanesan Aug 5, 2016
4f8354c
Fix validator issue with the bm definition.
stephanesan Aug 5, 2016
bccda4e
Merge pull request #7 from stephanesan/ro
stephanesan Sep 1, 2016
8fc6527
Merge pull request #9 from stephanesan/refactor
stephanesan Sep 1, 2016
c49904c
Merge branch 'fix_uuid_format_issue' of https://github.com/stephanesa…
stephanesan Sep 1, 2016
3ec63de
Merge branch 'stephanesan-fix_uuid_format_issue'
stephanesan Sep 1, 2016
01f205c
Merge pull request #11 from stephanesan/fix_bm_error
stephanesan Sep 1, 2016
579e7cb
Fix for excluding mndt format
SiMet Sep 7, 2016
a370b8b
Add some missing readOnly properties.
stephanesan Sep 12, 2016
ff804fc
Remove ReadOnly from the description.
stephanesan Sep 12, 2016
23f27a7
Add some missing readOnly properties.
stephanesan Sep 12, 2016
cb2c1f1
Update oic.wk.p-schema.json
SiMet Sep 14, 2016
eafd608
Move the date definition into the oic.types file.
stephanesan Sep 14, 2016
c8b403f
Merge pull request #13 from stephanesan/fix_missing_ro_properties
rabardini Sep 23, 2016
ded74de
Removed ReadOnly from Description
rabardini Sep 23, 2016
af20365
Merge branch 'master' of github.com:stephanesan/core into fix_date_fo…
stephanesan Sep 23, 2016
02346f4
Fix for not resolved merge
SiMet Sep 27, 2016
df24d6c
Merge pull request #16 from SiMet/patch-2
stephanesan Sep 27, 2016
0dd2b65
Merge pull request #15 from stephanesan/fix_date_format
rabardini Sep 28, 2016
9f20da5
Merge remote-tracking branch 'refs/remotes/openconnectivityfoundation…
rabardini Sep 28, 2016
e7193cb
Merge remote-tracking branch 'refs/remotes/origin/master' into openco…
rabardini Sep 29, 2016
4f1c1b5
v1.1.1
rabardini Sep 29, 2016
c9e7994
v1.1.1
rabardini Sep 29, 2016
01794be
Merge pull request #17 from rabardini/master
rabardini Sep 29, 2016
17a8ef7
Editoral fix to v1.1.1
rabardini Sep 30, 2016
240e869
Merge pull request #18 from rabardini/master
rabardini Sep 30, 2016
88134ba
Fix validation errors in examples of oic.wk.col.raml
stephanesan Oct 3, 2016
7ae50fd
Remove files that will not be part of the OIC 1.1 release.
stephanesan Oct 7, 2016
cc61e7d
Update oic.wk.p-schema.json
marktrayer Oct 11, 2016
6c4e123
Merge pull request #19 from stephanesan/fix_collections
rabardini Oct 11, 2016
af4292e
Merge pull request #24 from marktrayer/patch-2
rabardini Oct 11, 2016
f1ad1c8
Merge pull request #21 from stephanesan/CR58
rabardini Oct 11, 2016
4d300a0
Merge pull request #2 from openconnectivityfoundation/master
rabardini Oct 11, 2016
ad4cc12
Fix date format and collection syntax errrors
rabardini Oct 11, 2016
016eb70
Syntx error in examples corrected
rabardini Oct 11, 2016
75a9782
Merge pull request #25 from rabardini/master
rabardini Oct 11, 2016
4aaa3f7
Removed the link tag and added "rep" keyword
mjkoster Oct 24, 2016
5ac587f
Make "rel" an array
mjkoster Oct 24, 2016
80067a5
updated di and ins UUID
mjkoster Oct 30, 2016
b6a0105
fix typo in JSON
mjkoster Oct 30, 2016
23470b0
remove readonly json property from link parameter definitions
mjkoster Oct 31, 2016
d7a2f64
Merge pull request #26 from mjkoster/master
rabardini Nov 9, 2016
08f9a6d
Fix for invalid json schema
SiMet Nov 10, 2016
f69485f
Fix allOf section in oic.collection-schema.json
SiMet Nov 10, 2016
5b1d3a0
Merge pull request #27 from SiMet/patch-3
rabardini Nov 10, 2016
19ef394
Merge pull request #28 from SiMet/patch-4
rabardini Nov 10, 2016
9004b6e
Merge remote-tracking branch 'openconnectivityfoundation/master'
mjkoster Nov 15, 2016
f9d3f33
Update oic.oic-link schema
mjkoster Nov 15, 2016
e37baa3
change the batch update payload to match the batch retrieve payload
mjkoster Nov 15, 2016
d87fb8b
set additionalproperties to true
mjkoster Nov 15, 2016
7003176
Merge pull request #29 from mjkoster/master
rabardini Nov 16, 2016
a018b55
Merge pull request #3 from openconnectivityfoundation/master
rabardini Nov 16, 2016
864f38b
Fix for invalid json of oic.oic-link-schema.json
SiMet Nov 17, 2016
74780cf
Merge pull request #30 from SiMet/patch-5
rabardini Nov 29, 2016
6f86887
Merge pull request #4 from openconnectivityfoundation/master
rabardini Nov 29, 2016
716ef77
Add files via upload
rabardini Nov 29, 2016
4cc8c8f
Add files via upload
rabardini Nov 29, 2016
744c93f
Add files via upload
rabardini Nov 29, 2016
fd367ac
Update oic.oic-link-schema.json
rabardini Nov 30, 2016
d9a9dd5
Update oic.oic-link-schema.json
rabardini Nov 30, 2016
7e3b1b4
Update oic.collection-schema.json
rabardini Nov 30, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions DISCLAIMER.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
THIS SOFTWARE IS PROVIDED BY THE OPEN CONNECTIVITY FOUNDATION, INC. "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE OR WARRANTIES OF NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE OPEN CONNECTIVITY FOUNDATION, INC. OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3 changes: 3 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
64 changes: 64 additions & 0 deletions oic.collection-schema.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.",
"id": "https://www.openconnectivity.org/ocf-apis/core/schemas/oic.collection-schema.json#",
"title": "Collection",
"definitions": {
"oic.collection.setoflinks": {
"description": "A set (array) of simple or individual OIC Links. In addition to properties required for an OIC Link, the identifier for that link in this set is also required",
"type": "array",
"items": {
"$ref": "oic.oic-link-schema.json#/definitions/oic.oic-link"
}
},
"oic.collection.alllinks": {
"description": "All forms of links in a collection",
"$ref": "#/definitions/oic.collection.setoflinks"
},
"oic.collection": {
"type": "object",
"description": "A collection is a set (array) of tagged-link or set (array) of simple links along with additional properties to describe the collection itself",
"properties": {
"n": {
"type": "string",
"description": "User friendly name of the collection" },
"id": {
"anyOf": [
{
"type": "integer",
"description": "A number that is unique to that collection; like an ordinal number that is not repeated"
},
{
"type": "string",
"description": "A unique string that could be a hash or similarly unique"
},
{
"$ref": "oic.types-schema.json#/definitions/uuid",
"description": "A unique string that could be a UUIDv4"
}
],
"description": "ID for the collection. Can be an value that is unique to the use context or a UUIDv4"
},
"di": {
"$ref": "oic.types-schema.json#/definitions/uuid",
"description": "The device ID which is an UUIDv4 string; used for backward compatibility with Spec A definition of /oic/res"
},
"rts": {
"$ref": "oic.core-schema.json#/definitions/oic.core/properties/rt",
"description": "Defines the list of allowable resource types (for Target and anchors) in links included in the collection; new links being created can only be from this list" },
"drel": {
"type": "string",
"description": "When specified this is the default relationship to use when an OIC Link does not specify an explicit relationship with *rel* parameter"
},
"links": {
"$ref": "#/definitions/oic.collection.alllinks"
}
}
}
},
"type": "object",
"allOf": [
{"$ref": "oic.core-schema.json#/definitions/oic.core"},
{"$ref": "#/definitions/oic.collection"}
]
}
148 changes: 148 additions & 0 deletions oic.oic-link-schema.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.",
"id": "https://www.openconnectivity.org/ocf-apis/core/schemas/oic.oic-link-schema.json#",
"definitions": {
"oic.oic-link": {
"type": "object",
"properties": {
"href": {
"type": "string",
"maxLength": 256,
"description": "This is the target URI, it can be specified as a Relative Reference or fully-qualified URI. Relative Reference should be used along with the di parameter to make it unique.",
"format": "uri"
},
"rel": {
"oneOf":[
{
"type": "array",
"items": [
{
"type": "string",
"maxLength": 64
}
],
"minItems": 1,
"default": ["hosts"]
},
{
"type": "string",
"maxLength": 64,
"default": "hosts"
}
],
"description": "The relation of the target URI referenced by the link to the context URI"
},
"rt": {
"type": "array",
"items" : [
{
"type" : "string",
"maxLength": 64
}
],
"minItems" : 1,
"readOnly": true,
"description": "Resource Type"
},
"if": {
"type": "array",
"items": [
{
"type" : "string",
"enum" : ["oic.if.baseline", "oic.if.ll", "oic.if.b", "oic.if.rw", "oic.if.r", "oic.if.a", "oic.if.s" ]
}
],
"minItems": 1,
"readOnly": true,
"description": "The interface set supported by this resource"
},
"di": {
"$ref": "oic.types-schema.json#/definitions/uuid",
"description": "Unique identifier for device (UUID)"
},
"buri": {
"type": "string",
"description": "The base URI used to fully qualify a Relative Reference in the href parameter. Use the OCF Schema for URI",
"maxLength": 256,
"format": "uri"
},
"p": {
"readOnly": true,
"description": "Specifies the framework policies on the Resource referenced by the target URI",
"type": "object",
"properties": {
"bm": {
"readOnly": true,
"description": "Specifies the framework policies on the Resource referenced by the target URI for e.g. observable and discoverable",
"type": "integer"
},
"sec": {
"readOnly": true,
"description": "Specifies if security needs to be turned on when looking to interact with the Resource",
"default": false,
"type": "boolean"
},
"port": {
"readOnly": true,
"description": "Secure port to be used for connection",
"type": "integer"
}
},
"required" : ["bm"]
},
"bp": {
"type": "string",
"description": " Batch Parameters: URI parameters to use with an oic.if.b batch request using this link"
},
"title": {
"type": "string",
"maxLength": 64,
"description": "A title for the link relation. Can be used by the UI to provide a context"
},
"anchor": {
"type": "string",
"maxLength": 256,
"description": "This is used to override the context URI e.g. override the URI of the containing collection",
"format": "uri"
},
"ins": {
"oneOf": [
{
"type": "integer",
"description": "An ordinal number that is not repeated - must be unique in the collection context"
},
{
"type": "string",
"maxLength": 256,
"format" : "uri",
"description": "Any unique string including a URI"
},
{
"$ref": "oic.types-schema.json#/definitions/uuid",
"description": "Unique identifier (UUID)"
}
],
"description": "The instance identifier for this web link in an array of web links - used in collections"
},
"type": {
"type": "array",
"description": "A hint at the representation of the resource referenced by the target URI. This represents the media types that are used for both accepting and emitting",
"items" : [
{
"type": "string",
"maxLength": 64
}
],
"minItems": 1,
"default": "application/cbor"
}
},
"required": [ "href", "rt", "if" ]
}
},
"type": "object",
"allOf": [
{ "$ref": "#/definitions/oic.oic-link" }
]
}
Loading