From 0c13ff8472282b139128bdcfbc9768899dd58aef Mon Sep 17 00:00:00 2001 From: Stephane Lejeune Date: Mon, 7 Mar 2016 17:45:50 +0100 Subject: [PATCH 01/15] Refactoring work for adding directory structure to schemas. --- oic.wk.con.raml | 2 +- oic.wk.d.raml | 2 +- oic.wk.ifs.raml | 2 +- oic.wk.mnt.raml | 2 +- oic.wk.mon.raml | 2 +- oic.wk.p.raml | 2 +- oic.wk.ping.raml | 2 +- oic.wk.res.raml | 2 +- oic.wk.rts.raml | 2 +- rdpublish.raml | 6 +++--- rules.raml | 8 ++++---- scene.raml | 8 ++++---- oic.collection.json => schemas/oic.collection-schema.json | 2 +- oic.core.json => schemas/oic.core-schema.json | 2 +- oic.oic-link.json => schemas/oic.oic-link-schema.json | 2 +- oic.rd.publish.json => schemas/oic.rd.publish-schema.json | 2 +- .../oic.rd.selection-schema.json | 2 +- .../oic.rule-Update-schema.json | 4 ++-- oic.rule.json => schemas/oic.rule-schema.json | 4 ++-- oic.ruleMember.json => schemas/oic.ruleMember-schema.json | 2 +- .../oic.sceneCollection-Update-schema.json | 4 ++-- .../oic.sceneCollection-schema.json | 4 ++-- .../oic.sceneMember-schema.json | 2 +- oic.wk.con.json => schemas/oic.wk.con-schema.json | 2 +- oic.wk.d.json => schemas/oic.wk.d-schema.json | 2 +- oic.wk.ifs.json => schemas/oic.wk.ifs-schema.json | 2 +- oic.wk.mnt.json => schemas/oic.wk.mnt-schema.json | 4 ++-- oic.wk.mon.json => schemas/oic.wk.mon-schema.json | 2 +- oic.wk.p.json => schemas/oic.wk.p-schema.json | 2 +- oic.wk.ping.json => schemas/oic.wk.ping-schema.json | 2 +- oic.wk.res.json => schemas/oic.wk.res-schema.json | 2 +- oic.wk.rts.json => schemas/oic.wk.rts-schema.json | 2 +- 32 files changed, 45 insertions(+), 45 deletions(-) rename oic.collection.json => schemas/oic.collection-schema.json (98%) rename oic.core.json => schemas/oic.core-schema.json (93%) rename oic.oic-link.json => schemas/oic.oic-link-schema.json (96%) rename oic.rd.publish.json => schemas/oic.rd.publish-schema.json (91%) rename oic.rd.selection.json => schemas/oic.rd.selection-schema.json (97%) rename oic.rule-Update.json => schemas/oic.rule-Update-schema.json (90%) rename oic.rule.json => schemas/oic.rule-schema.json (90%) rename oic.ruleMember.json => schemas/oic.ruleMember-schema.json (94%) rename oic.sceneCollection-Update.json => schemas/oic.sceneCollection-Update-schema.json (89%) rename oic.sceneCollection.json => schemas/oic.sceneCollection-schema.json (89%) rename oic.sceneMember.json => schemas/oic.sceneMember-schema.json (95%) rename oic.wk.con.json => schemas/oic.wk.con-schema.json (93%) rename oic.wk.d.json => schemas/oic.wk.d-schema.json (93%) rename oic.wk.ifs.json => schemas/oic.wk.ifs-schema.json (88%) rename oic.wk.mnt.json => schemas/oic.wk.mnt-schema.json (80%) rename oic.wk.mon.json => schemas/oic.wk.mon-schema.json (93%) rename oic.wk.p.json => schemas/oic.wk.p-schema.json (96%) rename oic.wk.ping.json => schemas/oic.wk.ping-schema.json (90%) rename oic.wk.res.json => schemas/oic.wk.res-schema.json (92%) rename oic.wk.rts.json => schemas/oic.wk.rts-schema.json (88%) diff --git a/oic.wk.con.raml b/oic.wk.con.raml index 7e0cc41..b2a7546 100755 --- a/oic.wk.con.raml +++ b/oic.wk.con.raml @@ -11,7 +11,7 @@ documentation: THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. schemas: - - Configuration: !include oic.wk.con.json + - Configuration: !include schemas/oic.wk.con-schema.json traits: diff --git a/oic.wk.d.raml b/oic.wk.d.raml index 49ec76f..f630ce9 100755 --- a/oic.wk.d.raml +++ b/oic.wk.d.raml @@ -11,7 +11,7 @@ documentation: THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. schemas: - - Device: !include oic.wk.d.json + - Device: !include schemas/oic.wk.d-schema.json traits: - interface: queryParameters: diff --git a/oic.wk.ifs.raml b/oic.wk.ifs.raml index 10fc648..29dd906 100755 --- a/oic.wk.ifs.raml +++ b/oic.wk.ifs.raml @@ -11,7 +11,7 @@ documentation: THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. schemas: - - IFS: !include oic.wk.ifs.json + - IFS: !include schemas/oic.wk.ifs-schema.json traits: - interface: queryParameters: diff --git a/oic.wk.mnt.raml b/oic.wk.mnt.raml index cc71910..f708c29 100755 --- a/oic.wk.mnt.raml +++ b/oic.wk.mnt.raml @@ -11,7 +11,7 @@ documentation: THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. schemas: - - MNT: !include oic.wk.mnt.json + - MNT: !include schemas/oic.wk.mnt-schema.json traits: - interface: queryParameters: diff --git a/oic.wk.mon.raml b/oic.wk.mon.raml index 7f901b2..9726230 100755 --- a/oic.wk.mon.raml +++ b/oic.wk.mon.raml @@ -11,7 +11,7 @@ documentation: THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. schemas: - - MON: !include oic.wk.mon.json + - MON: !include schemas/oic.wk.mon-schema.json traits: - interface: queryParameters: diff --git a/oic.wk.p.raml b/oic.wk.p.raml index c4c1204..caec049 100755 --- a/oic.wk.p.raml +++ b/oic.wk.p.raml @@ -11,7 +11,7 @@ documentation: THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. schemas: - - Platform: !include oic.wk.p.json + - Platform: !include schemas/oic.wk.p-schema.json traits: - interface: queryParameters: diff --git a/oic.wk.ping.raml b/oic.wk.ping.raml index 5108089..0874efb 100755 --- a/oic.wk.ping.raml +++ b/oic.wk.ping.raml @@ -11,7 +11,7 @@ documentation: THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. schemas: - - PING: !include oic.wk.ping.json + - PING: !include schemas/oic.wk.ping-schema.json traits: - interface: queryParameters: diff --git a/oic.wk.res.raml b/oic.wk.res.raml index e16e6bc..c58e80b 100755 --- a/oic.wk.res.raml +++ b/oic.wk.res.raml @@ -11,7 +11,7 @@ documentation: THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. schemas: - - Resources: !include oic.wk.res.json + - Resources: !include schemas/oic.wk.res-schema.json traits: - interface: queryParameters: diff --git a/oic.wk.rts.raml b/oic.wk.rts.raml index 5871f35..ada86bc 100755 --- a/oic.wk.rts.raml +++ b/oic.wk.rts.raml @@ -11,7 +11,7 @@ documentation: THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. schemas: - - RTS: !include oic.wk.rts.json + - RTS: !include schemas/oic.wk.rts-schema.json traits: - interface: queryParameters: diff --git a/rdpublish.raml b/rdpublish.raml index 7a2e892..5cff1dd 100755 --- a/rdpublish.raml +++ b/rdpublish.raml @@ -36,9 +36,9 @@ documentation: schemas: - # Each schema represents an OIC Resource Type. The baseline interface operates on the entire representation - rdPublish: !include oic.rd.publish.json - rdSelection: !include oic.rd.selection.json - # rdDelLink: !include oic.rd.del-link.json + rdPublish: !include schemas/oic.rd.publish-schema.json + rdSelection: !include schemas/oic.rd.selection-schema.json + # rdDelLink: !include schemas/oic.rd.del-link-schema.json traits: - rddefinterface: diff --git a/rules.raml b/rules.raml index f7c43ec..b3c2f7b 100755 --- a/rules.raml +++ b/rules.raml @@ -11,10 +11,10 @@ documentation: THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. schemas: - - Collection: !include oic.collection.json - Rule: !include oic.rule.json - RuleUpdate: !include oic.rule-Update.json - RuleMember: !include oic.ruleMember.json + - Collection: !include schemas/oic.collection-schema.json + Rule: !include schemas/oic.rule-schema.json + RuleUpdate: !include schemas/oic.rule-Update-schema.json + RuleMember: !include schemas/oic.ruleMember-schema.json traits: - interface: diff --git a/scene.raml b/scene.raml index 53a0c2a..9a6a0ce 100755 --- a/scene.raml +++ b/scene.raml @@ -11,10 +11,10 @@ documentation: THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. schemas: - - Collection: !include oic.collection.json - SceneCollection: !include oic.sceneCollection.json - SceneCollectionUpdate: !include oic.sceneCollection-Update.json - SceneMember: !include oic.sceneMember.json + - Collection: !include schemas/oic.collection-schema.json + SceneCollection: !include schemas/oic.sceneCollection-schema.json + SceneCollectionUpdate: !include schemas/oic.sceneCollection-Update-schema.json + SceneMember: !include schemas/oic.sceneMember-schema.json traits: - interface: diff --git a/oic.collection.json b/schemas/oic.collection-schema.json similarity index 98% rename from oic.collection.json rename to schemas/oic.collection-schema.json index 7685c88..97d5170 100755 --- a/oic.collection.json +++ b/schemas/oic.collection-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/schemas/oic.collection.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.collection.json#", "title": "Collection", "definitions": { "oic.collection.setoflinks": { diff --git a/oic.core.json b/schemas/oic.core-schema.json similarity index 93% rename from oic.core.json rename to schemas/oic.core-schema.json index 0324908..a3fdf82 100755 --- a/oic.core.json +++ b/schemas/oic.core-schema.json @@ -1,5 +1,5 @@ { - "id": "http://openinterconnect.org/schemas/oic.core#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.core#", "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", "title": "Core", diff --git a/oic.oic-link.json b/schemas/oic.oic-link-schema.json similarity index 96% rename from oic.oic-link.json rename to schemas/oic.oic-link-schema.json index f4f805f..edcb8de 100755 --- a/oic.oic-link.json +++ b/schemas/oic.oic-link-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/rm/oic.oic-link.json", + "id": "http://openconnectivityfoundation.org/core/rm/oic.oic-link.json", "type": "object", "properties": { "href": { diff --git a/oic.rd.publish.json b/schemas/oic.rd.publish-schema.json similarity index 91% rename from oic.rd.publish.json rename to schemas/oic.rd.publish-schema.json index c94a6bb..0416d2b 100755 --- a/oic.rd.publish.json +++ b/schemas/oic.rd.publish-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/schemas/oic.rd.publish.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.rd.publish.json#", "title": "RD Publish & Update", "definitions": { "oic.rd.publish": { diff --git a/oic.rd.selection.json b/schemas/oic.rd.selection-schema.json similarity index 97% rename from oic.rd.selection.json rename to schemas/oic.rd.selection-schema.json index b52054c..6669169 100755 --- a/oic.rd.selection.json +++ b/schemas/oic.rd.selection-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/schemas/oic.rd.selection.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.rd.selection.json#", "title" : "RD Selection", "definitions": { "oic.rd.attributes": { diff --git a/oic.rule-Update.json b/schemas/oic.rule-Update-schema.json similarity index 90% rename from oic.rule-Update.json rename to schemas/oic.rule-Update-schema.json index 2b200da..bd5d4f0 100755 --- a/oic.rule-Update.json +++ b/schemas/oic.rule-Update-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/schemas/oic.rule.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.rule.json#", "title" : "Rule", "definitions": { "oic.rule": { @@ -38,7 +38,7 @@ "description": "Array of OIC web links that are the rule members, this is the script", "items" : { "allOf": [ - { "$ref": "http://openinterconnect.org/schemas/oic.oic-link.json#" }, + { "$ref": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link.json#" }, { "required" : [ "ins" ] } ] } diff --git a/oic.rule.json b/schemas/oic.rule-schema.json similarity index 90% rename from oic.rule.json rename to schemas/oic.rule-schema.json index 4ed0911..08d94e9 100755 --- a/oic.rule.json +++ b/schemas/oic.rule-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/schemas/oic.rule.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.rule.json#", "title" : "Rule", "definitions": { "oic.rule": { @@ -38,7 +38,7 @@ "description": "Array of OIC web links that are the rule members, this is the script", "items" : { "allOf": [ - { "$ref": "http://openinterconnect.org/schemas/oic.oic-link.json#" }, + { "$ref": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link.json#" }, { "required" : [ "ins" ] } ] } diff --git a/oic.ruleMember.json b/schemas/oic.ruleMember-schema.json similarity index 94% rename from oic.ruleMember.json rename to schemas/oic.ruleMember-schema.json index 9f4895f..9b45ab3 100755 --- a/oic.ruleMember.json +++ b/schemas/oic.ruleMember-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/schemas/oic.ruleMember.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.ruleMember.json#", "title" : "Rule Member", "definitions": { "oic.ruleMember": { diff --git a/oic.sceneCollection-Update.json b/schemas/oic.sceneCollection-Update-schema.json similarity index 89% rename from oic.sceneCollection-Update.json rename to schemas/oic.sceneCollection-Update-schema.json index f5ccfe8..8755224 100755 --- a/oic.sceneCollection-Update.json +++ b/schemas/oic.sceneCollection-Update-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/schemas/oic.sceneCollection.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.sceneCollection.json#", "title" : "Scene Collection", "definitions": { "oic.sceneCollection": { @@ -36,7 +36,7 @@ "description": "Array of OIC web links that are reference from this collection", "items" : { "allOf": [ - { "$ref": "http://openinterconnect.org/schemas/oic.oic-link.json#" }, + { "$ref": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link.json#" }, { "required" : [ "ins" ] } ] } diff --git a/oic.sceneCollection.json b/schemas/oic.sceneCollection-schema.json similarity index 89% rename from oic.sceneCollection.json rename to schemas/oic.sceneCollection-schema.json index a56fc4c..dce0eb8 100755 --- a/oic.sceneCollection.json +++ b/schemas/oic.sceneCollection-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/schemas/oic.sceneCollection.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.sceneCollection.json#", "title" : "Scene Collection", "definitions": { "oic.sceneCollection": { @@ -36,7 +36,7 @@ "description": "Array of OIC web links that are reference from this collection", "items" : { "allOf": [ - { "$ref": "http://openinterconnect.org/schemas/oic.oic-link.json#" }, + { "$ref": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link.json#" }, { "required" : [ "ins" ] } ] } diff --git a/oic.sceneMember.json b/schemas/oic.sceneMember-schema.json similarity index 95% rename from oic.sceneMember.json rename to schemas/oic.sceneMember-schema.json index 1e4d26b..d8da417 100755 --- a/oic.sceneMember.json +++ b/schemas/oic.sceneMember-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/schemas/oic.sceneMember.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.sceneMember.json#", "title" : "Scene Member", "definitions": { "oic.sceneMember": { diff --git a/oic.wk.con.json b/schemas/oic.wk.con-schema.json similarity index 93% rename from oic.wk.con.json rename to schemas/oic.wk.con-schema.json index f499c13..0b4d065 100755 --- a/oic.wk.con.json +++ b/schemas/oic.wk.con-schema.json @@ -1,5 +1,5 @@ { - "id": "http://openinterconnect.org/oic.wk.con#", + "id": "http://openconnectivityfoundation.org/core/oic.wk.con#", "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", "definitions": { diff --git a/oic.wk.d.json b/schemas/oic.wk.d-schema.json similarity index 93% rename from oic.wk.d.json rename to schemas/oic.wk.d-schema.json index 3450dbf..3915e5d 100755 --- a/oic.wk.d.json +++ b/schemas/oic.wk.d-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/oic.wk.d#", + "id": "http://openconnectivityfoundation.org/core/oic.wk.d#", "definitions": { "oic.wk.d": { "type": "object", diff --git a/oic.wk.ifs.json b/schemas/oic.wk.ifs-schema.json similarity index 88% rename from oic.wk.ifs.json rename to schemas/oic.wk.ifs-schema.json index 6cf8d17..5eee7bb 100755 --- a/oic.wk.ifs.json +++ b/schemas/oic.wk.ifs-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/oic.wk.ifs#", + "id": "http://openconnectivityfoundation.org/core/oic.wk.ifs#", "definitions": { "oic.wk.ifs": { "type": "object", diff --git a/oic.wk.mnt.json b/schemas/oic.wk.mnt-schema.json similarity index 80% rename from oic.wk.mnt.json rename to schemas/oic.wk.mnt-schema.json index 445e6bc..3646f19 100755 --- a/oic.wk.mnt.json +++ b/schemas/oic.wk.mnt-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/oic.wk.mnt#", + "id": "http://openconnectivityfoundation.org/core/oic.wk.mnt#", "definitions": { "oic.wk.mnt": { "type": "object", @@ -21,7 +21,7 @@ }, "type": "object", "allOf": [ - {"$ref": "http://openinterconnect.org/oic.core.json#/definitions/oic.core"}, + {"$ref": "http://openconnectivityfoundation.org/core/oic.core.json#/definitions/oic.core"}, {"$ref": "#/definitions/oic.wk.mnt" } ], "required": ["fr", "rb", "ssc"] diff --git a/oic.wk.mon.json b/schemas/oic.wk.mon-schema.json similarity index 93% rename from oic.wk.mon.json rename to schemas/oic.wk.mon-schema.json index 81ce5ac..7d50175 100755 --- a/oic.wk.mon.json +++ b/schemas/oic.wk.mon-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/oic.wk.mon#", + "id": "http://openconnectivityfoundation.org/core/oic.wk.mon#", "definitions": { "oic.wk.mon": { "type": "object", diff --git a/oic.wk.p.json b/schemas/oic.wk.p-schema.json similarity index 96% rename from oic.wk.p.json rename to schemas/oic.wk.p-schema.json index a471c99..ebbdd8a 100755 --- a/oic.wk.p.json +++ b/schemas/oic.wk.p-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/oic.wk.p#", + "id": "http://openconnectivityfoundation.org/core/oic.wk.p#", "definitions": { "oic.wk.p": { "type": "object", diff --git a/oic.wk.ping.json b/schemas/oic.wk.ping-schema.json similarity index 90% rename from oic.wk.ping.json rename to schemas/oic.wk.ping-schema.json index bf6f524..d2107d6 100755 --- a/oic.wk.ping.json +++ b/schemas/oic.wk.ping-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/oic.wk.ping#", + "id": "http://openconnectivityfoundation.org/core/oic.wk.ping#", "definitions": { "oic.wk.ping": { "type": "object", diff --git a/oic.wk.res.json b/schemas/oic.wk.res-schema.json similarity index 92% rename from oic.wk.res.json rename to schemas/oic.wk.res-schema.json index 89dea19..5c5f062 100755 --- a/oic.wk.res.json +++ b/schemas/oic.wk.res-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-v4/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/schemas/oic.wk.res.json/", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.wk.res.json/", "definitions": { "oic.res-links.json": { "type": "object", diff --git a/oic.wk.rts.json b/schemas/oic.wk.rts-schema.json similarity index 88% rename from oic.wk.rts.json rename to schemas/oic.wk.rts-schema.json index e0ee9de..7c91946 100755 --- a/oic.wk.rts.json +++ b/schemas/oic.wk.rts-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openinterconnect.org/oic.wk.rts#", + "id": "http://openconnectivityfoundation.org/core/oic.wk.rts#", "definitions": { "oic.wk.rts": { "type": "object", From 8c73c87933b2c800b88ad3d5ad2bb3395f077262 Mon Sep 17 00:00:00 2001 From: Stephane Lejeune Date: Mon, 7 Mar 2016 17:58:14 +0100 Subject: [PATCH 02/15] Refactor: continued teh rename *.json -> *-schema.json --- schemas/oic.collection-schema.json | 6 +++--- schemas/oic.oic-link-schema.json | 2 +- schemas/oic.rd.publish-schema.json | 4 ++-- schemas/oic.rd.selection-schema.json | 2 +- schemas/oic.rule-Update-schema.json | 6 +++--- schemas/oic.rule-schema.json | 6 +++--- schemas/oic.ruleMember-schema.json | 6 +++--- schemas/oic.sceneCollection-Update-schema.json | 6 +++--- schemas/oic.sceneCollection-schema.json | 6 +++--- schemas/oic.sceneMember-schema.json | 6 +++--- schemas/oic.wk.con-schema.json | 2 +- schemas/oic.wk.mnt-schema.json | 2 +- schemas/oic.wk.mon-schema.json | 2 +- schemas/oic.wk.ping-schema.json | 2 +- schemas/oic.wk.res-schema.json | 8 ++++---- 15 files changed, 33 insertions(+), 33 deletions(-) diff --git a/schemas/oic.collection-schema.json b/schemas/oic.collection-schema.json index 97d5170..98ec196 100755 --- a/schemas/oic.collection-schema.json +++ b/schemas/oic.collection-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/schemas/oic.collection.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.collection-schema.json#", "title": "Collection", "definitions": { "oic.collection.setoflinks": { @@ -14,7 +14,7 @@ "items": { "allOf": [ { - "$ref": "oic.oic-link.json#" + "$ref": "oic.oic-link-schema.json#" } ], "required": ["ins"] @@ -132,7 +132,7 @@ "type": "object", "allOf": [ { - "$ref": "oic.core.json#/definitions/oic.core" + "$ref": "oic.core-schema.json#/definitions/oic.core" }, { "$ref": "#/definitions/oic.collection" diff --git a/schemas/oic.oic-link-schema.json b/schemas/oic.oic-link-schema.json index edcb8de..6e00cc5 100755 --- a/schemas/oic.oic-link-schema.json +++ b/schemas/oic.oic-link-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/rm/oic.oic-link.json", + "id": "http://openconnectivityfoundation.org/core/rm/oic.oic-link-schema.json", "type": "object", "properties": { "href": { diff --git a/schemas/oic.rd.publish-schema.json b/schemas/oic.rd.publish-schema.json index 0416d2b..cd68f78 100755 --- a/schemas/oic.rd.publish-schema.json +++ b/schemas/oic.rd.publish-schema.json @@ -1,14 +1,14 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/schemas/oic.rd.publish.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.rd.publish-schema.json#", "title": "RD Publish & Update", "definitions": { "oic.rd.publish": { "description": "Publishes resources as OIC Links into the resource directory", "properties": { "linkSet": { - "$ref": "oic.collection.json#/definitions/oic.collection.setof-tagged-setoflinks" + "$ref": "oic.collection-schema.json#/definitions/oic.collection.setof-tagged-setoflinks" }, "ttl": { "type": "integer", diff --git a/schemas/oic.rd.selection-schema.json b/schemas/oic.rd.selection-schema.json index 6669169..55c0141 100755 --- a/schemas/oic.rd.selection-schema.json +++ b/schemas/oic.rd.selection-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/schemas/oic.rd.selection.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.rd.selection-schema.json#", "title" : "RD Selection", "definitions": { "oic.rd.attributes": { diff --git a/schemas/oic.rule-Update-schema.json b/schemas/oic.rule-Update-schema.json index bd5d4f0..699dd12 100755 --- a/schemas/oic.rule-Update-schema.json +++ b/schemas/oic.rule-Update-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/schemas/oic.rule.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.rule-schema.json#", "title" : "Rule", "definitions": { "oic.rule": { @@ -38,7 +38,7 @@ "description": "Array of OIC web links that are the rule members, this is the script", "items" : { "allOf": [ - { "$ref": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link.json#" }, + { "$ref": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link-schema.json#" }, { "required" : [ "ins" ] } ] } @@ -50,7 +50,7 @@ "type": "object", "allOf" : [ - { "$ref": "oic.core.json#/definitions/oic.core" }, + { "$ref": "oic.core-schema.json#/definitions/oic.core" }, { "$ref": "#/definitions/oic.rule" } ] } diff --git a/schemas/oic.rule-schema.json b/schemas/oic.rule-schema.json index 08d94e9..fa824e9 100755 --- a/schemas/oic.rule-schema.json +++ b/schemas/oic.rule-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/schemas/oic.rule.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.rule-schema.json#", "title" : "Rule", "definitions": { "oic.rule": { @@ -38,7 +38,7 @@ "description": "Array of OIC web links that are the rule members, this is the script", "items" : { "allOf": [ - { "$ref": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link.json#" }, + { "$ref": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link-schema.json#" }, { "required" : [ "ins" ] } ] } @@ -50,7 +50,7 @@ "type": "object", "allOf" : [ - { "$ref": "oic.core.json#/definitions/oic.core" }, + { "$ref": "oic.core-schema.json#/definitions/oic.core" }, { "$ref": "#/definitions/oic.rule" } ] } diff --git a/schemas/oic.ruleMember-schema.json b/schemas/oic.ruleMember-schema.json index 9b45ab3..09504ed 100755 --- a/schemas/oic.ruleMember-schema.json +++ b/schemas/oic.ruleMember-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/schemas/oic.ruleMember.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.ruleMember-schema.json#", "title" : "Rule Member", "definitions": { "oic.ruleMember": { @@ -31,7 +31,7 @@ "link": { "type": "string", "description": "web link that points at a resource", - "$ref": "oic.oic-link.json#" + "$ref": "oic.oic-link-schema.json#" } }, "required": [ "id", "link", "memberProperty", "memberValue" ], @@ -41,7 +41,7 @@ "type": "object", "allOf" : [ - { "$ref": "oic.core.json#/definitions/oic.core" }, + { "$ref": "oic.core-schema.json#/definitions/oic.core" }, { "$ref": "#/definitions/oic.ruleMember" } ] } diff --git a/schemas/oic.sceneCollection-Update-schema.json b/schemas/oic.sceneCollection-Update-schema.json index 8755224..6ccb6f6 100755 --- a/schemas/oic.sceneCollection-Update-schema.json +++ b/schemas/oic.sceneCollection-Update-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/schemas/oic.sceneCollection.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.sceneCollection-schema.json#", "title" : "Scene Collection", "definitions": { "oic.sceneCollection": { @@ -36,7 +36,7 @@ "description": "Array of OIC web links that are reference from this collection", "items" : { "allOf": [ - { "$ref": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link.json#" }, + { "$ref": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link-schema.json#" }, { "required" : [ "ins" ] } ] } @@ -48,7 +48,7 @@ "type": "object", "allOf" : [ - { "$ref": "oic.core.json#/definitions/oic.core" }, + { "$ref": "oic.core-schema.json#/definitions/oic.core" }, { "$ref": "#/definitions/oic.sceneCollection" } ] } diff --git a/schemas/oic.sceneCollection-schema.json b/schemas/oic.sceneCollection-schema.json index dce0eb8..2ee8212 100755 --- a/schemas/oic.sceneCollection-schema.json +++ b/schemas/oic.sceneCollection-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/schemas/oic.sceneCollection.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.sceneCollection-schema.json#", "title" : "Scene Collection", "definitions": { "oic.sceneCollection": { @@ -36,7 +36,7 @@ "description": "Array of OIC web links that are reference from this collection", "items" : { "allOf": [ - { "$ref": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link.json#" }, + { "$ref": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link-schema.json#" }, { "required" : [ "ins" ] } ] } @@ -48,7 +48,7 @@ "type": "object", "allOf" : [ - { "$ref": "oic.core.json#/definitions/oic.core" }, + { "$ref": "oic.core-schema.json#/definitions/oic.core" }, { "$ref": "#/definitions/oic.sceneCollection" } ] } diff --git a/schemas/oic.sceneMember-schema.json b/schemas/oic.sceneMember-schema.json index d8da417..8548b16 100755 --- a/schemas/oic.sceneMember-schema.json +++ b/schemas/oic.sceneMember-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/schemas/oic.sceneMember.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.sceneMember-schema.json#", "title" : "Scene Member", "definitions": { "oic.sceneMember": { @@ -44,7 +44,7 @@ "link": { "type": "string", "description": "web link that points at an resource", - "$ref": "oic.oic-link.json#" + "$ref": "oic.oic-link-schema.json#" } }, "required": [ "link" ] @@ -53,7 +53,7 @@ "type": "object", "allOf" : [ - { "$ref": "oic.core.json#/definitions/oic.core" }, + { "$ref": "oic.core-schema.json#/definitions/oic.core" }, { "$ref": "#/definitions/oic.sceneMember" } ] } diff --git a/schemas/oic.wk.con-schema.json b/schemas/oic.wk.con-schema.json index 0b4d065..bcf628a 100755 --- a/schemas/oic.wk.con-schema.json +++ b/schemas/oic.wk.con-schema.json @@ -32,7 +32,7 @@ }, "type": "object", "allOf": [ - {"$ref": "oic.core.json#/definitions/oic.core"}, + {"$ref": "oic.core-schema.json#/definitions/oic.core"}, { "$ref": "#/definitions/oic.wk.con" } ], "required": [ "n" ] diff --git a/schemas/oic.wk.mnt-schema.json b/schemas/oic.wk.mnt-schema.json index 3646f19..9af5a75 100755 --- a/schemas/oic.wk.mnt-schema.json +++ b/schemas/oic.wk.mnt-schema.json @@ -21,7 +21,7 @@ }, "type": "object", "allOf": [ - {"$ref": "http://openconnectivityfoundation.org/core/oic.core.json#/definitions/oic.core"}, + {"$ref": "http://openconnectivityfoundation.org/core/oic.core-schema.json#/definitions/oic.core"}, {"$ref": "#/definitions/oic.wk.mnt" } ], "required": ["fr", "rb", "ssc"] diff --git a/schemas/oic.wk.mon-schema.json b/schemas/oic.wk.mon-schema.json index 7d50175..2700c96 100755 --- a/schemas/oic.wk.mon-schema.json +++ b/schemas/oic.wk.mon-schema.json @@ -24,7 +24,7 @@ }, "type": "object", "allOf": [ - {"$ref": "oic.core.json#/definitions/oic.core"}, + {"$ref": "oic.core-schema.json#/definitions/oic.core"}, {"$ref": "#/definitions/oic.wk.mon"} ], "required": ["av", "lat"] diff --git a/schemas/oic.wk.ping-schema.json b/schemas/oic.wk.ping-schema.json index d2107d6..e1847da 100755 --- a/schemas/oic.wk.ping-schema.json +++ b/schemas/oic.wk.ping-schema.json @@ -16,7 +16,7 @@ "type": "object", "allOf": [ { - "$ref": "oic.core.json#/definitions/oic.core" + "$ref": "oic.core-schema.json#/definitions/oic.core" }, { "$ref": "#/definitions/oic.wk.ping" diff --git a/schemas/oic.wk.res-schema.json b/schemas/oic.wk.res-schema.json index 5c5f062..7109fe9 100755 --- a/schemas/oic.wk.res-schema.json +++ b/schemas/oic.wk.res-schema.json @@ -1,9 +1,9 @@ { "$schema": "http://json-schema.org/draft-v4/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/schemas/oic.wk.res.json/", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.wk.res-schema.json/", "definitions": { - "oic.res-links.json": { + "oic.res-links-schema.json": { "type": "object", "properties": { "n": { @@ -22,7 +22,7 @@ "links": { "type": "array", "items": { - "$ref": "oic.oic-link.json#" + "$ref": "oic.oic-link-schema.json#" } } } @@ -31,7 +31,7 @@ "description": "The list of resources expressed as OIC links", "type": "array", "items": { - "$ref": "#/definitions/oic.res-links.json" + "$ref": "#/definitions/oic.res-links-schema.json" }, "required": ["di", "links"] } From dd79a69fbd91cbf5e01e6607c9490c3df69243ea Mon Sep 17 00:00:00 2001 From: Stephane Lejeune Date: Mon, 7 Mar 2016 18:32:47 +0100 Subject: [PATCH 03/15] Also refactor id's that were not terminated with .json --- schemas/oic.core-schema.json | 2 +- schemas/oic.wk.con-schema.json | 2 +- schemas/oic.wk.d-schema.json | 2 +- schemas/oic.wk.ifs-schema.json | 2 +- schemas/oic.wk.mnt-schema.json | 2 +- schemas/oic.wk.mon-schema.json | 2 +- schemas/oic.wk.p-schema.json | 2 +- schemas/oic.wk.ping-schema.json | 2 +- schemas/oic.wk.rts-schema.json | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/schemas/oic.core-schema.json b/schemas/oic.core-schema.json index a3fdf82..dd3a531 100755 --- a/schemas/oic.core-schema.json +++ b/schemas/oic.core-schema.json @@ -1,5 +1,5 @@ { - "id": "http://openconnectivityfoundation.org/core/schemas/oic.core#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.core-schema.json#", "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", "title": "Core", diff --git a/schemas/oic.wk.con-schema.json b/schemas/oic.wk.con-schema.json index bcf628a..d6d6832 100755 --- a/schemas/oic.wk.con-schema.json +++ b/schemas/oic.wk.con-schema.json @@ -1,5 +1,5 @@ { - "id": "http://openconnectivityfoundation.org/core/oic.wk.con#", + "id": "http://openconnectivityfoundation.org/core/oic.wk.con-schema.json#", "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", "definitions": { diff --git a/schemas/oic.wk.d-schema.json b/schemas/oic.wk.d-schema.json index 3915e5d..f5bec0b 100755 --- a/schemas/oic.wk.d-schema.json +++ b/schemas/oic.wk.d-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/oic.wk.d#", + "id": "http://openconnectivityfoundation.org/core/oic.wk.d-schema.json#", "definitions": { "oic.wk.d": { "type": "object", diff --git a/schemas/oic.wk.ifs-schema.json b/schemas/oic.wk.ifs-schema.json index 5eee7bb..1a7060d 100755 --- a/schemas/oic.wk.ifs-schema.json +++ b/schemas/oic.wk.ifs-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/oic.wk.ifs#", + "id": "http://openconnectivityfoundation.org/core/oic.wk.ifs-schema.json#", "definitions": { "oic.wk.ifs": { "type": "object", diff --git a/schemas/oic.wk.mnt-schema.json b/schemas/oic.wk.mnt-schema.json index 9af5a75..2bd9681 100755 --- a/schemas/oic.wk.mnt-schema.json +++ b/schemas/oic.wk.mnt-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/oic.wk.mnt#", + "id": "http://openconnectivityfoundation.org/core/oic.wk.mnt-schema.json#", "definitions": { "oic.wk.mnt": { "type": "object", diff --git a/schemas/oic.wk.mon-schema.json b/schemas/oic.wk.mon-schema.json index 2700c96..3470242 100755 --- a/schemas/oic.wk.mon-schema.json +++ b/schemas/oic.wk.mon-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/oic.wk.mon#", + "id": "http://openconnectivityfoundation.org/core/oic.wk.mon-schema.json#", "definitions": { "oic.wk.mon": { "type": "object", diff --git a/schemas/oic.wk.p-schema.json b/schemas/oic.wk.p-schema.json index ebbdd8a..850d02c 100755 --- a/schemas/oic.wk.p-schema.json +++ b/schemas/oic.wk.p-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/oic.wk.p#", + "id": "http://openconnectivityfoundation.org/core/oic.wk.p-schema.json#", "definitions": { "oic.wk.p": { "type": "object", diff --git a/schemas/oic.wk.ping-schema.json b/schemas/oic.wk.ping-schema.json index e1847da..1af7211 100755 --- a/schemas/oic.wk.ping-schema.json +++ b/schemas/oic.wk.ping-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/oic.wk.ping#", + "id": "http://openconnectivityfoundation.org/core/oic.wk.ping-schema.json#", "definitions": { "oic.wk.ping": { "type": "object", diff --git a/schemas/oic.wk.rts-schema.json b/schemas/oic.wk.rts-schema.json index 7c91946..867696f 100755 --- a/schemas/oic.wk.rts-schema.json +++ b/schemas/oic.wk.rts-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/oic.wk.rts#", + "id": "http://openconnectivityfoundation.org/core/oic.wk.rts-schema.json#", "definitions": { "oic.wk.rts": { "type": "object", @@ -19,4 +19,4 @@ { "$ref": "#/definitions/oic.wk.rts" } ], "required": ["tl"] -} \ No newline at end of file +} From 27c2fbb4da62db01b7491d9166520effcbf2695a Mon Sep 17 00:00:00 2001 From: Stephane Lejeune Date: Mon, 7 Mar 2016 18:45:30 +0100 Subject: [PATCH 04/15] Fix dual documentation declaration in rdpublish.raml. --- rdpublish.raml | 1 - 1 file changed, 1 deletion(-) diff --git a/rdpublish.raml b/rdpublish.raml index 5cff1dd..0f50824 100755 --- a/rdpublish.raml +++ b/rdpublish.raml @@ -10,7 +10,6 @@ documentation: 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. THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. -documentation: - title: OIC Rsource Directory content: | A Resoure Directory is an OIC Device that helps other OIC Devices to be discovered. From 3f099d7349a54fa83063a28b784bb61edfae37b0 Mon Sep 17 00:00:00 2001 From: Stephane Lejeune Date: Tue, 8 Mar 2016 12:51:52 +0100 Subject: [PATCH 05/15] include legal notice from external file. --- LICENSE.md | 7 +++ oic.wk.con.raml | 9 +-- oic.wk.d.raml | 9 +-- oic.wk.ifs.raml | 9 +-- oic.wk.mnt.raml | 9 +-- oic.wk.mon.raml | 9 +-- oic.wk.p.raml | 9 +-- oic.wk.ping.raml | 9 +-- oic.wk.res.raml | 9 +-- oic.wk.rts.raml | 9 +-- rdpublish.raml | 153 +---------------------------------------------- rules.raml | 9 +-- scene.raml | 9 +-- 13 files changed, 31 insertions(+), 228 deletions(-) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..f1d3677 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,7 @@ +Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved. + +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. + +THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. diff --git a/oic.wk.con.raml b/oic.wk.con.raml index b2a7546..47c9aa8 100755 --- a/oic.wk.con.raml +++ b/oic.wk.con.raml @@ -2,13 +2,8 @@ title: OIC Configuration version: v1-20150807 documentation: - - title: Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved. - content: | - 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. - - THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. + - title: Legal + content: !include LICENSE.md schemas: - Configuration: !include schemas/oic.wk.con-schema.json diff --git a/oic.wk.d.raml b/oic.wk.d.raml index f630ce9..7bc7e3b 100755 --- a/oic.wk.d.raml +++ b/oic.wk.d.raml @@ -2,13 +2,8 @@ title: OIC Root Device version: v1-20150811 documentation: - - title: Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved. - content: | - 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. - - THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. + - title: Legal + content: !include LICENSE.md schemas: - Device: !include schemas/oic.wk.d-schema.json diff --git a/oic.wk.ifs.raml b/oic.wk.ifs.raml index 29dd906..ff2645a 100755 --- a/oic.wk.ifs.raml +++ b/oic.wk.ifs.raml @@ -2,13 +2,8 @@ title: OIC Interface Types version: v1-20150811 documentation: - - title: Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved. - content: | - 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. - - THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. + - title: Legal + content: !include LICENSE.md schemas: - IFS: !include schemas/oic.wk.ifs-schema.json diff --git a/oic.wk.mnt.raml b/oic.wk.mnt.raml index f708c29..6a1ad20 100755 --- a/oic.wk.mnt.raml +++ b/oic.wk.mnt.raml @@ -2,13 +2,8 @@ title: OIC Maintenance version: v1-20150811 documentation: - - title: Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved. - content: | - 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. - - THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. + - title: Legal + content: !include LICENSE.md schemas: - MNT: !include schemas/oic.wk.mnt-schema.json diff --git a/oic.wk.mon.raml b/oic.wk.mon.raml index 9726230..c547ecc 100755 --- a/oic.wk.mon.raml +++ b/oic.wk.mon.raml @@ -2,13 +2,8 @@ title: OIC Monitoring version: v1-20150401 documentation: - - title: Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved. - content: | - 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. - - THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. + - title: Legal + content: !include LICENSE.md schemas: - MON: !include schemas/oic.wk.mon-schema.json diff --git a/oic.wk.p.raml b/oic.wk.p.raml index caec049..3757d6a 100755 --- a/oic.wk.p.raml +++ b/oic.wk.p.raml @@ -2,13 +2,8 @@ title: OIC Base Platform version: v1-20150804 documentation: - - title: Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved. - content: | - 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. - - THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. + - title: Legal + content: !include LICENSE.md schemas: - Platform: !include schemas/oic.wk.p-schema.json diff --git a/oic.wk.ping.raml b/oic.wk.ping.raml index 0874efb..5373714 100755 --- a/oic.wk.ping.raml +++ b/oic.wk.ping.raml @@ -2,13 +2,8 @@ title: OIC Ping version: v1-20150814 documentation: - - title: Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved. - content: | - 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. - - THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. + - title: Legal + content: !include LICENSE.md schemas: - PING: !include schemas/oic.wk.ping-schema.json diff --git a/oic.wk.res.raml b/oic.wk.res.raml index c58e80b..b409f0a 100755 --- a/oic.wk.res.raml +++ b/oic.wk.res.raml @@ -2,13 +2,8 @@ title: OIC Discoverable Resources version: v1-20150807 documentation: - - title: Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved. - content: | - 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. - - THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. + - title: Legal + content: !include LICENSE.md schemas: - Resources: !include schemas/oic.wk.res-schema.json diff --git a/oic.wk.rts.raml b/oic.wk.rts.raml index ada86bc..a2f8223 100755 --- a/oic.wk.rts.raml +++ b/oic.wk.rts.raml @@ -2,13 +2,8 @@ title: OIC Resource Types version: v1-20150811 documentation: - - title: Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved. - content: | - 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. - - THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. + - title: Legal + content: !include LICENSE.md schemas: - RTS: !include schemas/oic.wk.rts-schema.json diff --git a/rdpublish.raml b/rdpublish.raml index 0f50824..5cf5d3b 100755 --- a/rdpublish.raml +++ b/rdpublish.raml @@ -3,155 +3,6 @@ title: Resource Directory version: 1.0-090215 documentation: - - title: Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved. - content: | - 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. - - THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. + - title: Legal + content: !include LICENSE.md - title: OIC Rsource Directory - content: | - A Resoure Directory is an OIC Device that helps other OIC Devices to be discovered. - - title: Introduction - content: | - For resource in other OIC Devices to be discovered using the Resource Directory, these other devices have to publish the resource links they would otherwise have advertised through /oic/res to the Resource Directory. Once the information has been published then the OIC Devices may stop responding to discovery queries and may also go to sleep. - - The Resource Directory will respond to all discovery queries with resources that it directly advertises and also the resource information that has been published to it. - - title: Resource Directory discovery - content: | - Before an OIC Device publishes its resource information, it must first discover available Resource Directories and then select one of those to publish the information to. - - This doscovery is done with a multicast query to /oic/rd. The information returned is either a bais factor or a list of attributes that help the discovering OIC Device to select one of the RDs. This RD will be used till the RD does not respond or another RD is selected. - - title: Resource Directory publish - content: | - Once the RD has been discovery and selected, the OIC Device can publish its resoure information. The resource information are published to the /oic/rd resource using the "publish" interface. The information that needs to tbe available in /oic/res is then populated by the Resource Directory. - - Periodically based on the TTL set by the publishing OIC Device, the information that is published has to be refreshed with a new TTL or the TTL can be updated if there is no change in the information. It is the responsibility of the publishing OIC Device to ensure that the information or TTL is updated before the previous TTL expires; failing this the RD will garbage collect all the information related to the publishing OIC Device. - - title: Resource discovery - content: | - The discovery of resources is done in the same manner as for any OIC Server. A query to /oic/res either over multicast or uincast is required. - -schemas: -- - # Each schema represents an OIC Resource Type. The baseline interface operates on the entire representation - rdPublish: !include schemas/oic.rd.publish-schema.json - rdSelection: !include schemas/oic.rd.selection-schema.json - # rdDelLink: !include schemas/oic.rd.del-link-schema.json - -traits: -- rddefinterface: - queryParameters: - if: - description: | - Interface is optional since there is only one interface supported for the OIC Resource Type - Both for RD selectin and for publish - type: string - enum: [ "oic.if.baseline" ] - default: "oic.if.baseline" - required: false - example: | - GET /oic/rd?if=oic.wk.baseline - -/oic/rd: - displayName: Resource directory resource - description: | - Resource to be exposed by any OIC Device that can act as a Resource Directory - get: - description: | - Get the attributes of the Resource Directory for selection purposes. - queryParameters: - rt: - description: | - Only one OIC Resource Type is used for GET; OIC RT is optional - type: string - enum: [ "oic.wk.rd" ] - default: "oic.wk.rd" - required: false - example: | - GET /oic/rd?rt=oic.wk.rd - is: [ rddefinterface ] - responses: - 200: - description: | - Respond with the selector criteria - either the set of attributes or the bias factor - body: - application/json: - schema: rdSelection - example: | - { - "rt": "oic.wk.rd", - "sel": 50 - } - post: - description: | - Publish the resource information. Appropriates parts of the information posted will be discovered through /oic/res - body: - application/json: - schema: rdPublish - # Maybe the entire published information should be treated as a new resource - as if created using the link-batch interface. - queryParameters: - rt: - description: | - Only one OIC Resource Type is used for GET; OIC RT is optional - type: string - enum: [ "oic.wk.rdpub" ] - default: "oic.wk.rdpub" - required: false - example: | - GET /oic/rd?rt=oic.wk.rdpub - is: [ rddefinterface ] - responses: - 200: - description: | - Respond with the same schema as publish but with the links have the "ins" parameter set to the appropriate instance value. - This value is used by the receiver to manage that OIC Link instance. - body: - application/json: - schema: rdPublish - example: | - { - "links": [ - { - "href": "coap://someAuthority:1000/somePath", - "rt": "oic.r.someResource", - "if": "oic.if.a", - "ins": 12345 - }, - { - "href": "coap://someAuthority:1000/somePath", - "rt": "oic.r.someOtherResource", - "if": "oic.if.baseline", - "ins": 54321 - } - ], - "ttl": 600 - } - - delete: - description: | - Delete a particular OIC Link - the link may be a simple link or a link in a tagged set. - queryParameters: - di: - displayName: ID of the device making request - description: | - This is used to determine which set of links to operata on. (Need authentication to ensure that there is no spoofing). If instance is ommitted then the entire set of links from this device ID is deleted - type: string - required: true - example: | - DELETE /oic/rd?di="0685B960-736F-46F7-BEC0-9E6CBD671ADC1" - ins: - displayName: Link instance for deletion - description: | - Instance of the link to delete - Value of parameter is a string where instance to be deleted are comma separated - type: string - required: false - example: | - DELETE /oic/rd?di="0685B960-736F-46F7-BEC0-9E6CBD671ADC1";ins="20" - responses: - 200: - description: The delete succeeded - -# The discovery through the /oic/res of the resource directory is the same as the standard resource discovery -# Need to include the RAML for /oic/res based resource discovery diff --git a/rules.raml b/rules.raml index b3c2f7b..abf8a5e 100755 --- a/rules.raml +++ b/rules.raml @@ -2,13 +2,8 @@ title: OICRules version: v1.0-20150810 documentation: - - title: Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved. - content: | - 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. - - THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. + - title: Legal + content: !include LICENSE.md schemas: - Collection: !include schemas/oic.collection-schema.json diff --git a/scene.raml b/scene.raml index 9a6a0ce..d03ee7c 100755 --- a/scene.raml +++ b/scene.raml @@ -2,13 +2,8 @@ title: OICScene version: v1.0-20150630 documentation: - - title: Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved. - content: | - 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. - - THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. + - title: Legal + content: !include LICENSE.md schemas: - Collection: !include schemas/oic.collection-schema.json From 7ba5cf38da6e5a24c0f383a2272ebec58dc09085 Mon Sep 17 00:00:00 2001 From: Stephane Lejeune Date: Tue, 8 Mar 2016 13:04:51 +0100 Subject: [PATCH 06/15] repair rdpublish which was messed up with previous commit. --- rdpublish.raml | 144 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/rdpublish.raml b/rdpublish.raml index 5cf5d3b..0bc5f76 100755 --- a/rdpublish.raml +++ b/rdpublish.raml @@ -6,3 +6,147 @@ documentation: - title: Legal content: !include LICENSE.md - title: OIC Rsource Directory + content: | + A Resoure Directory is an OIC Device that helps other OIC Devices to be discovered. + - title: Introduction + content: | + For resource in other OIC Devices to be discovered using the Resource Directory, these other devices have to publish the resource links they would otherwise have advertised through /oic/res to the Resource Directory. Once the information has been published then the OIC Devices may stop responding to discovery queries and may also go to sleep. + + The Resource Directory will respond to all discovery queries with resources that it directly advertises and also the resource information that has been published to it. + - title: Resource Directory discovery + content: | + Before an OIC Device publishes its resource information, it must first discover available Resource Directories and then select one of those to publish the information to. + + This doscovery is done with a multicast query to /oic/rd. The information returned is either a bais factor or a list of attributes that help the discovering OIC Device to select one of the RDs. This RD will be used till the RD does not respond or another RD is selected. + - title: Resource Directory publish + content: | + Once the RD has been discovery and selected, the OIC Device can publish its resoure information. The resource information are published to the /oic/rd resource using the "publish" interface. The information that needs to tbe available in /oic/res is then populated by the Resource Directory. + + Periodically based on the TTL set by the publishing OIC Device, the information that is published has to be refreshed with a new TTL or the TTL can be updated if there is no change in the information. It is the responsibility of the publishing OIC Device to ensure that the information or TTL is updated before the previous TTL expires; failing this the RD will garbage collect all the information related to the publishing OIC Device. + - title: Resource discovery + content: | + The discovery of resources is done in the same manner as for any OIC Server. A query to /oic/res either over multicast or uincast is required. + +schemas: +- + # Each schema represents an OIC Resource Type. The baseline interface operates on the entire representation + rdPublish: !include schemas/oic.rd.publish-schema.json + rdSelection: !include schemas/oic.rd.selection-schema.json + # rdDelLink: !include schemas/oic.rd.del-link-schema.json + +traits: +- rddefinterface: + queryParameters: + if: + description: | + Interface is optional since there is only one interface supported for the OIC Resource Type + Both for RD selectin and for publish + type: string + enum: [ "oic.if.baseline" ] + default: "oic.if.baseline" + required: false + example: | + GET /oic/rd?if=oic.wk.baseline + +/oic/rd: + displayName: Resource directory resource + description: | + Resource to be exposed by any OIC Device that can act as a Resource Directory + get: + description: | + Get the attributes of the Resource Directory for selection purposes. + queryParameters: + rt: + description: | + Only one OIC Resource Type is used for GET; OIC RT is optional + type: string + enum: [ "oic.wk.rd" ] + default: "oic.wk.rd" + required: false + example: | + GET /oic/rd?rt=oic.wk.rd + is: [ rddefinterface ] + responses: + 200: + description: | + Respond with the selector criteria - either the set of attributes or the bias factor + body: + application/json: + schema: rdSelection + example: | + { + "rt": "oic.wk.rd", + "sel": 50 + } + post: + description: | + Publish the resource information. Appropriates parts of the information posted will be discovered through /oic/res + body: + application/json: + schema: rdPublish + # Maybe the entire published information should be treated as a new resource - as if created using the link-batch interface. + queryParameters: + rt: + description: | + Only one OIC Resource Type is used for GET; OIC RT is optional + type: string + enum: [ "oic.wk.rdpub" ] + default: "oic.wk.rdpub" + required: false + example: | + GET /oic/rd?rt=oic.wk.rdpub + is: [ rddefinterface ] + responses: + 200: + description: | + Respond with the same schema as publish but with the links have the "ins" parameter set to the appropriate instance value. + This value is used by the receiver to manage that OIC Link instance. + body: + application/json: + schema: rdPublish + example: | + { + "links": [ + { + "href": "coap://someAuthority:1000/somePath", + "rt": "oic.r.someResource", + "if": "oic.if.a", + "ins": 12345 + }, + { + "href": "coap://someAuthority:1000/somePath", + "rt": "oic.r.someOtherResource", + "if": "oic.if.baseline", + "ins": 54321 + } + ], + "ttl": 600 + } + + delete: + description: | + Delete a particular OIC Link - the link may be a simple link or a link in a tagged set. + queryParameters: + di: + displayName: ID of the device making request + description: | + This is used to determine which set of links to operata on. (Need authentication to ensure that there is no spoofing). If instance is ommitted then the entire set of links from this device ID is deleted + type: string + required: true + example: | + DELETE /oic/rd?di="0685B960-736F-46F7-BEC0-9E6CBD671ADC1" + ins: + displayName: Link instance for deletion + description: | + Instance of the link to delete + Value of parameter is a string where instance to be deleted are comma separated + type: string + required: false + example: | + DELETE /oic/rd?di="0685B960-736F-46F7-BEC0-9E6CBD671ADC1";ins="20" + responses: + 200: + description: The delete succeeded + +# The discovery through the /oic/res of the resource directory is the same as the standard resource discovery +# Need to include the RAML for /oic/res based resource discovery From e28a9e0a92e17042ba3e83661e4c0fbce8bdc4ba Mon Sep 17 00:00:00 2001 From: Stephane Lejeune Date: Fri, 18 Mar 2016 15:50:25 +0100 Subject: [PATCH 07/15] Test splitting legal content in seperate files. --- COPYRIGHT.md | 1 + DISCLAIMER.md | 1 + LICENSE.md | 4 ---- oic.wk.con.raml | 8 +++++++- oic.wk.d.raml | 8 +++++++- oic.wk.ifs.raml | 8 +++++++- oic.wk.mnt.raml | 8 +++++++- oic.wk.mon.raml | 8 +++++++- oic.wk.p.raml | 8 +++++++- oic.wk.ping.raml | 8 +++++++- oic.wk.res.raml | 8 +++++++- oic.wk.rts.raml | 8 +++++++- rdpublish.raml | 8 +++++++- rules.raml | 8 +++++++- scene.raml | 8 +++++++- 15 files changed, 86 insertions(+), 16 deletions(-) create mode 100644 COPYRIGHT.md create mode 100644 DISCLAIMER.md diff --git a/COPYRIGHT.md b/COPYRIGHT.md new file mode 100644 index 0000000..ea13d74 --- /dev/null +++ b/COPYRIGHT.md @@ -0,0 +1 @@ +Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved. diff --git a/DISCLAIMER.md b/DISCLAIMER.md new file mode 100644 index 0000000..1ceb458 --- /dev/null +++ b/DISCLAIMER.md @@ -0,0 +1 @@ +THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. diff --git a/LICENSE.md b/LICENSE.md index f1d3677..0e4811b 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,3 @@ -Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved. - 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. - -THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. diff --git a/oic.wk.con.raml b/oic.wk.con.raml index 47c9aa8..6107ec8 100755 --- a/oic.wk.con.raml +++ b/oic.wk.con.raml @@ -2,8 +2,14 @@ title: OIC Configuration version: v1-20150807 documentation: - - title: Legal + + - title: OCF Copyright + content: !include COPYRIGHT.md + - title: OCF License content: !include LICENSE.md + - title: OCF Disclaimer + content: !include DISCLAIMER.md + schemas: - Configuration: !include schemas/oic.wk.con-schema.json diff --git a/oic.wk.d.raml b/oic.wk.d.raml index 7bc7e3b..2666b80 100755 --- a/oic.wk.d.raml +++ b/oic.wk.d.raml @@ -2,8 +2,14 @@ title: OIC Root Device version: v1-20150811 documentation: - - title: Legal + + - title: OCF Copyright + content: !include COPYRIGHT.md + - title: OCF License content: !include LICENSE.md + - title: OCF Disclaimer + content: !include DISCLAIMER.md + schemas: - Device: !include schemas/oic.wk.d-schema.json diff --git a/oic.wk.ifs.raml b/oic.wk.ifs.raml index ff2645a..91ee6c5 100755 --- a/oic.wk.ifs.raml +++ b/oic.wk.ifs.raml @@ -2,8 +2,14 @@ title: OIC Interface Types version: v1-20150811 documentation: - - title: Legal + + - title: OCF Copyright + content: !include COPYRIGHT.md + - title: OCF License content: !include LICENSE.md + - title: OCF Disclaimer + content: !include DISCLAIMER.md + schemas: - IFS: !include schemas/oic.wk.ifs-schema.json diff --git a/oic.wk.mnt.raml b/oic.wk.mnt.raml index 6a1ad20..ef36c9d 100755 --- a/oic.wk.mnt.raml +++ b/oic.wk.mnt.raml @@ -2,8 +2,14 @@ title: OIC Maintenance version: v1-20150811 documentation: - - title: Legal + + - title: OCF Copyright + content: !include COPYRIGHT.md + - title: OCF License content: !include LICENSE.md + - title: OCF Disclaimer + content: !include DISCLAIMER.md + schemas: - MNT: !include schemas/oic.wk.mnt-schema.json diff --git a/oic.wk.mon.raml b/oic.wk.mon.raml index c547ecc..7b1a963 100755 --- a/oic.wk.mon.raml +++ b/oic.wk.mon.raml @@ -2,8 +2,14 @@ title: OIC Monitoring version: v1-20150401 documentation: - - title: Legal + + - title: OCF Copyright + content: !include COPYRIGHT.md + - title: OCF License content: !include LICENSE.md + - title: OCF Disclaimer + content: !include DISCLAIMER.md + schemas: - MON: !include schemas/oic.wk.mon-schema.json diff --git a/oic.wk.p.raml b/oic.wk.p.raml index 3757d6a..dae913a 100755 --- a/oic.wk.p.raml +++ b/oic.wk.p.raml @@ -2,8 +2,14 @@ title: OIC Base Platform version: v1-20150804 documentation: - - title: Legal + + - title: OCF Copyright + content: !include COPYRIGHT.md + - title: OCF License content: !include LICENSE.md + - title: OCF Disclaimer + content: !include DISCLAIMER.md + schemas: - Platform: !include schemas/oic.wk.p-schema.json diff --git a/oic.wk.ping.raml b/oic.wk.ping.raml index 5373714..4f29bff 100755 --- a/oic.wk.ping.raml +++ b/oic.wk.ping.raml @@ -2,8 +2,14 @@ title: OIC Ping version: v1-20150814 documentation: - - title: Legal + + - title: OCF Copyright + content: !include COPYRIGHT.md + - title: OCF License content: !include LICENSE.md + - title: OCF Disclaimer + content: !include DISCLAIMER.md + schemas: - PING: !include schemas/oic.wk.ping-schema.json diff --git a/oic.wk.res.raml b/oic.wk.res.raml index b409f0a..795e98d 100755 --- a/oic.wk.res.raml +++ b/oic.wk.res.raml @@ -2,8 +2,14 @@ title: OIC Discoverable Resources version: v1-20150807 documentation: - - title: Legal + + - title: OCF Copyright + content: !include COPYRIGHT.md + - title: OCF License content: !include LICENSE.md + - title: OCF Disclaimer + content: !include DISCLAIMER.md + schemas: - Resources: !include schemas/oic.wk.res-schema.json diff --git a/oic.wk.rts.raml b/oic.wk.rts.raml index a2f8223..3bc5609 100755 --- a/oic.wk.rts.raml +++ b/oic.wk.rts.raml @@ -2,8 +2,14 @@ title: OIC Resource Types version: v1-20150811 documentation: - - title: Legal + + - title: OCF Copyright + content: !include COPYRIGHT.md + - title: OCF License content: !include LICENSE.md + - title: OCF Disclaimer + content: !include DISCLAIMER.md + schemas: - RTS: !include schemas/oic.wk.rts-schema.json diff --git a/rdpublish.raml b/rdpublish.raml index 0bc5f76..6e711f8 100755 --- a/rdpublish.raml +++ b/rdpublish.raml @@ -3,8 +3,14 @@ title: Resource Directory version: 1.0-090215 documentation: - - title: Legal + + - title: OCF Copyright + content: !include COPYRIGHT.md + - title: OCF License content: !include LICENSE.md + - title: OCF Disclaimer + content: !include DISCLAIMER.md + - title: OIC Rsource Directory content: | A Resoure Directory is an OIC Device that helps other OIC Devices to be discovered. diff --git a/rules.raml b/rules.raml index abf8a5e..d24a1ee 100755 --- a/rules.raml +++ b/rules.raml @@ -2,8 +2,14 @@ title: OICRules version: v1.0-20150810 documentation: - - title: Legal + + - title: OCF Copyright + content: !include COPYRIGHT.md + - title: OCF License content: !include LICENSE.md + - title: OCF Disclaimer + content: !include DISCLAIMER.md + schemas: - Collection: !include schemas/oic.collection-schema.json diff --git a/scene.raml b/scene.raml index d03ee7c..8800d19 100755 --- a/scene.raml +++ b/scene.raml @@ -2,8 +2,14 @@ title: OICScene version: v1.0-20150630 documentation: - - title: Legal + + - title: OCF Copyright + content: !include COPYRIGHT.md + - title: OCF License content: !include LICENSE.md + - title: OCF Disclaimer + content: !include DISCLAIMER.md + schemas: - Collection: !include schemas/oic.collection-schema.json From 4b7c073a5e5b9ebc53197108819996605c2691d9 Mon Sep 17 00:00:00 2001 From: Stephane Lejeune Date: Wed, 23 Mar 2016 00:11:56 +0100 Subject: [PATCH 08/15] Implemented ocf lawyer's recommendation. Each directory needs to contain both the License and the Disclaimer. - Add License and Disclaimer to schema directory. Each file needs to contain the full copyright text. - Incorporate the copyright text instead of including the file. --- COPYRIGHT.md | 1 - oic.wk.con.raml | 2 +- oic.wk.d.raml | 2 +- oic.wk.ifs.raml | 2 +- oic.wk.mnt.raml | 2 +- oic.wk.mon.raml | 2 +- oic.wk.p.raml | 2 +- oic.wk.ping.raml | 2 +- oic.wk.res.raml | 2 +- oic.wk.rts.raml | 2 +- rdpublish.raml | 2 +- rules.raml | 2 +- scene.raml | 2 +- schemas/DISCLAIMER.md | 1 + schemas/LICENSE.md | 3 +++ 15 files changed, 16 insertions(+), 13 deletions(-) delete mode 100644 COPYRIGHT.md create mode 100644 schemas/DISCLAIMER.md create mode 100644 schemas/LICENSE.md diff --git a/COPYRIGHT.md b/COPYRIGHT.md deleted file mode 100644 index ea13d74..0000000 --- a/COPYRIGHT.md +++ /dev/null @@ -1 +0,0 @@ -Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved. diff --git a/oic.wk.con.raml b/oic.wk.con.raml index 6107ec8..391d25d 100755 --- a/oic.wk.con.raml +++ b/oic.wk.con.raml @@ -4,7 +4,7 @@ version: v1-20150807 documentation: - title: OCF Copyright - content: !include COPYRIGHT.md + content: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved. - title: OCF License content: !include LICENSE.md - title: OCF Disclaimer diff --git a/oic.wk.d.raml b/oic.wk.d.raml index 2666b80..a0d76e5 100755 --- a/oic.wk.d.raml +++ b/oic.wk.d.raml @@ -4,7 +4,7 @@ version: v1-20150811 documentation: - title: OCF Copyright - content: !include COPYRIGHT.md + content: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved. - title: OCF License content: !include LICENSE.md - title: OCF Disclaimer diff --git a/oic.wk.ifs.raml b/oic.wk.ifs.raml index 91ee6c5..efb933e 100755 --- a/oic.wk.ifs.raml +++ b/oic.wk.ifs.raml @@ -4,7 +4,7 @@ version: v1-20150811 documentation: - title: OCF Copyright - content: !include COPYRIGHT.md + content: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved. - title: OCF License content: !include LICENSE.md - title: OCF Disclaimer diff --git a/oic.wk.mnt.raml b/oic.wk.mnt.raml index ef36c9d..3cc575f 100755 --- a/oic.wk.mnt.raml +++ b/oic.wk.mnt.raml @@ -4,7 +4,7 @@ version: v1-20150811 documentation: - title: OCF Copyright - content: !include COPYRIGHT.md + content: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved. - title: OCF License content: !include LICENSE.md - title: OCF Disclaimer diff --git a/oic.wk.mon.raml b/oic.wk.mon.raml index 7b1a963..ef9e54b 100755 --- a/oic.wk.mon.raml +++ b/oic.wk.mon.raml @@ -4,7 +4,7 @@ version: v1-20150401 documentation: - title: OCF Copyright - content: !include COPYRIGHT.md + content: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved. - title: OCF License content: !include LICENSE.md - title: OCF Disclaimer diff --git a/oic.wk.p.raml b/oic.wk.p.raml index dae913a..d0aa0bf 100755 --- a/oic.wk.p.raml +++ b/oic.wk.p.raml @@ -4,7 +4,7 @@ version: v1-20150804 documentation: - title: OCF Copyright - content: !include COPYRIGHT.md + content: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved. - title: OCF License content: !include LICENSE.md - title: OCF Disclaimer diff --git a/oic.wk.ping.raml b/oic.wk.ping.raml index 4f29bff..b24e52e 100755 --- a/oic.wk.ping.raml +++ b/oic.wk.ping.raml @@ -4,7 +4,7 @@ version: v1-20150814 documentation: - title: OCF Copyright - content: !include COPYRIGHT.md + content: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved. - title: OCF License content: !include LICENSE.md - title: OCF Disclaimer diff --git a/oic.wk.res.raml b/oic.wk.res.raml index 795e98d..7b2756d 100755 --- a/oic.wk.res.raml +++ b/oic.wk.res.raml @@ -4,7 +4,7 @@ version: v1-20150807 documentation: - title: OCF Copyright - content: !include COPYRIGHT.md + content: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved. - title: OCF License content: !include LICENSE.md - title: OCF Disclaimer diff --git a/oic.wk.rts.raml b/oic.wk.rts.raml index 3bc5609..7fd052b 100755 --- a/oic.wk.rts.raml +++ b/oic.wk.rts.raml @@ -4,7 +4,7 @@ version: v1-20150811 documentation: - title: OCF Copyright - content: !include COPYRIGHT.md + content: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved. - title: OCF License content: !include LICENSE.md - title: OCF Disclaimer diff --git a/rdpublish.raml b/rdpublish.raml index 6e711f8..07d7d0a 100755 --- a/rdpublish.raml +++ b/rdpublish.raml @@ -5,7 +5,7 @@ version: 1.0-090215 documentation: - title: OCF Copyright - content: !include COPYRIGHT.md + content: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved. - title: OCF License content: !include LICENSE.md - title: OCF Disclaimer diff --git a/rules.raml b/rules.raml index d24a1ee..74f0e64 100755 --- a/rules.raml +++ b/rules.raml @@ -4,7 +4,7 @@ version: v1.0-20150810 documentation: - title: OCF Copyright - content: !include COPYRIGHT.md + content: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved. - title: OCF License content: !include LICENSE.md - title: OCF Disclaimer diff --git a/scene.raml b/scene.raml index 8800d19..77fbedc 100755 --- a/scene.raml +++ b/scene.raml @@ -4,7 +4,7 @@ version: v1.0-20150630 documentation: - title: OCF Copyright - content: !include COPYRIGHT.md + content: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved. - title: OCF License content: !include LICENSE.md - title: OCF Disclaimer diff --git a/schemas/DISCLAIMER.md b/schemas/DISCLAIMER.md new file mode 100644 index 0000000..1ceb458 --- /dev/null +++ b/schemas/DISCLAIMER.md @@ -0,0 +1 @@ +THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. diff --git a/schemas/LICENSE.md b/schemas/LICENSE.md new file mode 100644 index 0000000..0e4811b --- /dev/null +++ b/schemas/LICENSE.md @@ -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. From c903c1e4ad352d9a52fc31a1d211f0f6d257f127 Mon Sep 17 00:00:00 2001 From: Stephane Lejeune Date: Wed, 23 Mar 2016 00:28:02 +0100 Subject: [PATCH 09/15] Replace all OIC occurences by OCF in legal content. --- DISCLAIMER.md | 2 +- schemas/DISCLAIMER.md | 2 +- schemas/oic.collection-schema.json | 2 +- schemas/oic.core-schema.json | 2 +- schemas/oic.oic-link-schema.json | 2 +- schemas/oic.rd.publish-schema.json | 2 +- schemas/oic.rd.selection-schema.json | 2 +- schemas/oic.rule-Update-schema.json | 2 +- schemas/oic.rule-schema.json | 2 +- schemas/oic.ruleMember-schema.json | 2 +- schemas/oic.sceneCollection-Update-schema.json | 2 +- schemas/oic.sceneCollection-schema.json | 2 +- schemas/oic.sceneMember-schema.json | 2 +- schemas/oic.wk.con-schema.json | 2 +- schemas/oic.wk.d-schema.json | 2 +- schemas/oic.wk.ifs-schema.json | 2 +- schemas/oic.wk.mnt-schema.json | 2 +- schemas/oic.wk.mon-schema.json | 2 +- schemas/oic.wk.p-schema.json | 2 +- schemas/oic.wk.ping-schema.json | 2 +- schemas/oic.wk.res-schema.json | 2 +- schemas/oic.wk.rts-schema.json | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/DISCLAIMER.md b/DISCLAIMER.md index 1ceb458..4e81410 100644 --- a/DISCLAIMER.md +++ b/DISCLAIMER.md @@ -1 +1 @@ -THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. +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. diff --git a/schemas/DISCLAIMER.md b/schemas/DISCLAIMER.md index 1ceb458..4e81410 100644 --- a/schemas/DISCLAIMER.md +++ b/schemas/DISCLAIMER.md @@ -1 +1 @@ -THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, 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 INTERCONNECT CONSORTIUM, 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. +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. diff --git a/schemas/oic.collection-schema.json b/schemas/oic.collection-schema.json index 98ec196..c75a551 100755 --- a/schemas/oic.collection-schema.json +++ b/schemas/oic.collection-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/schemas/oic.collection-schema.json#", "title": "Collection", "definitions": { diff --git a/schemas/oic.core-schema.json b/schemas/oic.core-schema.json index dd3a531..e52a35e 100755 --- a/schemas/oic.core-schema.json +++ b/schemas/oic.core-schema.json @@ -1,7 +1,7 @@ { "id": "http://openconnectivityfoundation.org/core/schemas/oic.core-schema.json#", "$schema": "http://json-schema.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "title": "Core", "definitions": { "oic.core": { diff --git a/schemas/oic.oic-link-schema.json b/schemas/oic.oic-link-schema.json index 6e00cc5..164b1d7 100755 --- a/schemas/oic.oic-link-schema.json +++ b/schemas/oic.oic-link-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/rm/oic.oic-link-schema.json", "type": "object", "properties": { diff --git a/schemas/oic.rd.publish-schema.json b/schemas/oic.rd.publish-schema.json index cd68f78..2e1ad10 100755 --- a/schemas/oic.rd.publish-schema.json +++ b/schemas/oic.rd.publish-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/schemas/oic.rd.publish-schema.json#", "title": "RD Publish & Update", "definitions": { diff --git a/schemas/oic.rd.selection-schema.json b/schemas/oic.rd.selection-schema.json index 55c0141..afd3b47 100755 --- a/schemas/oic.rd.selection-schema.json +++ b/schemas/oic.rd.selection-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/schemas/oic.rd.selection-schema.json#", "title" : "RD Selection", "definitions": { diff --git a/schemas/oic.rule-Update-schema.json b/schemas/oic.rule-Update-schema.json index 699dd12..19ac15e 100755 --- a/schemas/oic.rule-Update-schema.json +++ b/schemas/oic.rule-Update-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/schemas/oic.rule-schema.json#", "title" : "Rule", "definitions": { diff --git a/schemas/oic.rule-schema.json b/schemas/oic.rule-schema.json index fa824e9..cd627a6 100755 --- a/schemas/oic.rule-schema.json +++ b/schemas/oic.rule-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/schemas/oic.rule-schema.json#", "title" : "Rule", "definitions": { diff --git a/schemas/oic.ruleMember-schema.json b/schemas/oic.ruleMember-schema.json index 09504ed..a419060 100755 --- a/schemas/oic.ruleMember-schema.json +++ b/schemas/oic.ruleMember-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/schemas/oic.ruleMember-schema.json#", "title" : "Rule Member", "definitions": { diff --git a/schemas/oic.sceneCollection-Update-schema.json b/schemas/oic.sceneCollection-Update-schema.json index 6ccb6f6..74a5931 100755 --- a/schemas/oic.sceneCollection-Update-schema.json +++ b/schemas/oic.sceneCollection-Update-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/schemas/oic.sceneCollection-schema.json#", "title" : "Scene Collection", "definitions": { diff --git a/schemas/oic.sceneCollection-schema.json b/schemas/oic.sceneCollection-schema.json index 2ee8212..b73419b 100755 --- a/schemas/oic.sceneCollection-schema.json +++ b/schemas/oic.sceneCollection-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/schemas/oic.sceneCollection-schema.json#", "title" : "Scene Collection", "definitions": { diff --git a/schemas/oic.sceneMember-schema.json b/schemas/oic.sceneMember-schema.json index 8548b16..036b66e 100755 --- a/schemas/oic.sceneMember-schema.json +++ b/schemas/oic.sceneMember-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/schemas/oic.sceneMember-schema.json#", "title" : "Scene Member", "definitions": { diff --git a/schemas/oic.wk.con-schema.json b/schemas/oic.wk.con-schema.json index d6d6832..8aa900c 100755 --- a/schemas/oic.wk.con-schema.json +++ b/schemas/oic.wk.con-schema.json @@ -1,7 +1,7 @@ { "id": "http://openconnectivityfoundation.org/core/oic.wk.con-schema.json#", "$schema": "http://json-schema.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "definitions": { "oic.wk.con": { "type": "object", diff --git a/schemas/oic.wk.d-schema.json b/schemas/oic.wk.d-schema.json index f5bec0b..f963b89 100755 --- a/schemas/oic.wk.d-schema.json +++ b/schemas/oic.wk.d-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/oic.wk.d-schema.json#", "definitions": { "oic.wk.d": { diff --git a/schemas/oic.wk.ifs-schema.json b/schemas/oic.wk.ifs-schema.json index 1a7060d..2794016 100755 --- a/schemas/oic.wk.ifs-schema.json +++ b/schemas/oic.wk.ifs-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/oic.wk.ifs-schema.json#", "definitions": { "oic.wk.ifs": { diff --git a/schemas/oic.wk.mnt-schema.json b/schemas/oic.wk.mnt-schema.json index 2bd9681..a6ad65a 100755 --- a/schemas/oic.wk.mnt-schema.json +++ b/schemas/oic.wk.mnt-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/oic.wk.mnt-schema.json#", "definitions": { "oic.wk.mnt": { diff --git a/schemas/oic.wk.mon-schema.json b/schemas/oic.wk.mon-schema.json index 3470242..b8e2142 100755 --- a/schemas/oic.wk.mon-schema.json +++ b/schemas/oic.wk.mon-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/oic.wk.mon-schema.json#", "definitions": { "oic.wk.mon": { diff --git a/schemas/oic.wk.p-schema.json b/schemas/oic.wk.p-schema.json index 850d02c..7564a8e 100755 --- a/schemas/oic.wk.p-schema.json +++ b/schemas/oic.wk.p-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/oic.wk.p-schema.json#", "definitions": { "oic.wk.p": { diff --git a/schemas/oic.wk.ping-schema.json b/schemas/oic.wk.ping-schema.json index 1af7211..0801306 100755 --- a/schemas/oic.wk.ping-schema.json +++ b/schemas/oic.wk.ping-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/oic.wk.ping-schema.json#", "definitions": { "oic.wk.ping": { diff --git a/schemas/oic.wk.res-schema.json b/schemas/oic.wk.res-schema.json index 7109fe9..e4dd568 100755 --- a/schemas/oic.wk.res-schema.json +++ b/schemas/oic.wk.res-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-v4/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/schemas/oic.wk.res-schema.json/", "definitions": { "oic.res-links-schema.json": { diff --git a/schemas/oic.wk.rts-schema.json b/schemas/oic.wk.rts-schema.json index 867696f..7ebb9dd 100755 --- a/schemas/oic.wk.rts-schema.json +++ b/schemas/oic.wk.rts-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", - "description" : "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.", + "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/oic.wk.rts-schema.json#", "definitions": { "oic.wk.rts": { From 66b987251287a3f946fc7350fc769069ea00edc7 Mon Sep 17 00:00:00 2001 From: Stephane Lejeune Date: Thu, 24 Mar 2016 11:50:40 +0100 Subject: [PATCH 10/15] All schemas id's include the 'schemas' folder and same document ref. Fixed the files that didn't have the 'schemas' subfolder in the id. Fixed the files that didn't have the '#' at the end of the id that indicates a same document reference. --- schemas/oic.oic-link-schema.json | 4 ++-- schemas/oic.wk.con-schema.json | 2 +- schemas/oic.wk.d-schema.json | 2 +- schemas/oic.wk.ifs-schema.json | 2 +- schemas/oic.wk.mnt-schema.json | 2 +- schemas/oic.wk.mon-schema.json | 2 +- schemas/oic.wk.p-schema.json | 2 +- schemas/oic.wk.ping-schema.json | 2 +- schemas/oic.wk.res-schema.json | 2 +- schemas/oic.wk.rts-schema.json | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/schemas/oic.oic-link-schema.json b/schemas/oic.oic-link-schema.json index 164b1d7..b214f5d 100755 --- a/schemas/oic.oic-link-schema.json +++ b/schemas/oic.oic-link-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/rm/oic.oic-link-schema.json", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link-schema.json#", "type": "object", "properties": { "href": { @@ -65,4 +65,4 @@ } }, "required": [ "href", "rt", "if" ] -} \ No newline at end of file +} diff --git a/schemas/oic.wk.con-schema.json b/schemas/oic.wk.con-schema.json index 8aa900c..9c83ec4 100755 --- a/schemas/oic.wk.con-schema.json +++ b/schemas/oic.wk.con-schema.json @@ -1,5 +1,5 @@ { - "id": "http://openconnectivityfoundation.org/core/oic.wk.con-schema.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.wk.con-schema.json#", "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "definitions": { diff --git a/schemas/oic.wk.d-schema.json b/schemas/oic.wk.d-schema.json index f963b89..09fbcf3 100755 --- a/schemas/oic.wk.d-schema.json +++ b/schemas/oic.wk.d-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/oic.wk.d-schema.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.wk.d-schema.json#", "definitions": { "oic.wk.d": { "type": "object", diff --git a/schemas/oic.wk.ifs-schema.json b/schemas/oic.wk.ifs-schema.json index 2794016..97c28dd 100755 --- a/schemas/oic.wk.ifs-schema.json +++ b/schemas/oic.wk.ifs-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/oic.wk.ifs-schema.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.wk.ifs-schema.json#", "definitions": { "oic.wk.ifs": { "type": "object", diff --git a/schemas/oic.wk.mnt-schema.json b/schemas/oic.wk.mnt-schema.json index a6ad65a..b31662e 100755 --- a/schemas/oic.wk.mnt-schema.json +++ b/schemas/oic.wk.mnt-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/oic.wk.mnt-schema.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.wk.mnt-schema.json#", "definitions": { "oic.wk.mnt": { "type": "object", diff --git a/schemas/oic.wk.mon-schema.json b/schemas/oic.wk.mon-schema.json index b8e2142..654a5d0 100755 --- a/schemas/oic.wk.mon-schema.json +++ b/schemas/oic.wk.mon-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/oic.wk.mon-schema.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.wk.mon-schema.json#", "definitions": { "oic.wk.mon": { "type": "object", diff --git a/schemas/oic.wk.p-schema.json b/schemas/oic.wk.p-schema.json index 7564a8e..ee03b4f 100755 --- a/schemas/oic.wk.p-schema.json +++ b/schemas/oic.wk.p-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/oic.wk.p-schema.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.wk.p-schema.json#", "definitions": { "oic.wk.p": { "type": "object", diff --git a/schemas/oic.wk.ping-schema.json b/schemas/oic.wk.ping-schema.json index 0801306..e80d8db 100755 --- a/schemas/oic.wk.ping-schema.json +++ b/schemas/oic.wk.ping-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/oic.wk.ping-schema.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.wk.ping-schema.json#", "definitions": { "oic.wk.ping": { "type": "object", diff --git a/schemas/oic.wk.res-schema.json b/schemas/oic.wk.res-schema.json index e4dd568..c84fbb7 100755 --- a/schemas/oic.wk.res-schema.json +++ b/schemas/oic.wk.res-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-v4/schema#", "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/schemas/oic.wk.res-schema.json/", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.wk.res-schema.json#", "definitions": { "oic.res-links-schema.json": { "type": "object", diff --git a/schemas/oic.wk.rts-schema.json b/schemas/oic.wk.rts-schema.json index 7ebb9dd..0a8950d 100755 --- a/schemas/oic.wk.rts-schema.json +++ b/schemas/oic.wk.rts-schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schemas.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", - "id": "http://openconnectivityfoundation.org/core/oic.wk.rts-schema.json#", + "id": "http://openconnectivityfoundation.org/core/schemas/oic.wk.rts-schema.json#", "definitions": { "oic.wk.rts": { "type": "object", From 64fd9f00c954992b3477a11efce83c6eadc48be5 Mon Sep 17 00:00:00 2001 From: rabardini Date: Mon, 2 May 2016 09:09:42 -0700 Subject: [PATCH 11/15] Align schemas to OIC v1.1 changes Changes to various schema files to reflect alignment to OIC v1.1 reflected in various OIC Change Requests. --- schemas/oic.core-schema.json | 30 +++++-- schemas/oic.oic-link-schema.json | 143 +++++++++++++++++++------------ schemas/oic.wk.con-schema.json | 6 +- schemas/oic.wk.d-schema.json | 16 +++- schemas/oic.wk.ifs-schema.json | 12 ++- schemas/oic.wk.mnt-schema.json | 13 ++- schemas/oic.wk.mon-schema.json | 11 ++- schemas/oic.wk.p-schema.json | 19 +++- schemas/oic.wk.ping-schema.json | 8 +- schemas/oic.wk.res-schema.json | 12 +-- schemas/oic.wk.rts-schema.json | 12 ++- 11 files changed, 190 insertions(+), 92 deletions(-) diff --git a/schemas/oic.core-schema.json b/schemas/oic.core-schema.json index e52a35e..40b03e4 100755 --- a/schemas/oic.core-schema.json +++ b/schemas/oic.core-schema.json @@ -8,7 +8,14 @@ "type": "object", "properties": { "rt": { - "type": "string", + "type": "array", + "items" : [ + { + "type" : "string", + "maxLength": 64 + } + ], + "minItems" : 1, "description": "ReadOnly, Resource Type" }, "if": { @@ -16,25 +23,36 @@ "items": [ { "type" : "string", - "enum" : ["oic.if.def", "oic.if.ll", "oic.if.b", "oic.if.rp", "oic.if.p", "oic.if.a", "oic.if.s" ] + "enum" : ["oic.if.baseline", "oic.if.ll", "oic.if.b", "oic.if.lb", "oic.if.rw", "oic.if.r", "oic.if.a", "oic.if.s" ] } ], "minItems": 1, "description": "ReadOnly, The interface set supported by this resource" }, "p": { - "type": "string", - "description": "ReadOnly, bitmap indicating observable and discoverable" + "description": "ReadOnly, JSON object containing a Bitmap indicating observable and discoverable", + "type": "object", + "properties": { + "bm": { + "type": "integer" + } + } }, "n": { "type": "string", - "description": "Friendly name of the resource" + "maxLength": 64, + "description": "ReadOnly, Friendly name of the resource" + }, + "id": { + "type": "string", + "maxLength": 64, + "description": "ReadOnly, Instance ID of this specific resource" } } } }, "type": "object", "allOf": [ - {"$ref": "#/definitions/oic.core"} + { "$ref": "#/definitions/oic.core"} ] } diff --git a/schemas/oic.oic-link-schema.json b/schemas/oic.oic-link-schema.json index b214f5d..ab7a159 100755 --- a/schemas/oic.oic-link-schema.json +++ b/schemas/oic.oic-link-schema.json @@ -2,67 +2,100 @@ "$schema": "http://json-schema.org/draft-04/schema#", "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link-schema.json#", - "type": "object", - "properties": { - "href": { - "type": "string", - "description": "RFC5988 style web-links serialized into JSON. This is the target URI", - "format": "uri" - }, - "rel": { - "type": "string", - "default": "advertises", - "description": "The relation of the target URI referenced by the link to the context URI" - }, - "rt": { - "type": "string", - "description": "Resource Type - A standard OIC specified or vendor defined resource type of the resource referenced by the target URI" - }, - "if": { - "type": "string", - "description": "Interface - The interfaces supported by the resource referenced by the target URI" - }, - "obs": { - "type": "boolean", - "description": "Specifies if the resource referenced by the target URIis observable or not", - "default": false - }, - "title": { - "type": "string", - "description": "A title for the link relation. Can be used by the UI to provide a context" - }, - "anchor": { - "type": "string", - "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" + "definitions": { + "oic.oic-link": { + "type": "object", + "properties": { + "href": { + "type": "string", + "maxLength": 256, + "description": "RFC5988 style web-links serialized into JSON. This is the target URI", + "format": "uri" }, - { + "rel": { "type": "string", - "description": "Any unique string including a URI" + "default": "advertises", + "maxLength": 64, + "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, + "description": "ReadOnly, Resource Type" }, - { + "if": { + "type": "array", + "items": [ + { + "type" : "string", + "enum" : ["oic.if.baseline", "oic.if.ll", "oic.if.b", "oic.if.lb", "oic.if.rw", "oic.if.r", "oic.if.a", "oic.if.s" ] + } + ], + "minItems": 1, + "description": "ReadOnly, The interface set supported by this resource" + }, + "p": { + "description": "ReadOnly, JSON object containing a Bitmap indicating observable and discoverable", + "type": "object", + "properties": { + "bm": { + "type": "integer" + } + } + }, + "title": { "type": "string", - "format": "uuid", - "description": "Use UUID for universal uniqueness - used in /oic/res to identify the device" + "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" + }, + { + "type": "string", + "format": "uuid", + "description": "Use UUID for universal uniqueness - used in /oic/res to identify the device" + } + ], + "description": "The instance identifier for this web link in an array of web links - used in collections" + }, + "ttl": { + "type": "integer", + "description": "The time to live for this link in seconds - value is specified in a request only and is not returned on response. Max integer size to represent time is 4 octets" + }, + "type": { + "type": "string", + "maxLength": 64, + "description": "A hint at the representation of the resource referenced by the target URI", + "default": "application/json" } - ], - "description": "The instance identifier for this web link in an array of web links - used in collections" - }, - "ttl": { - "type": "integer", - "description": "The time to live for this link in seconds - value is specified in a request only and is not returned on response. Max integer size to represent time is 4 octets" - }, - "type": { - "type": "string", - "description": "A hint at the representation of the resource referenced by the target URI", - "default": "application/json" + } } }, + "type": "object", + "allOf": [ + { "$ref": "#/definitions/oic.oic-link" } + ], "required": [ "href", "rt", "if" ] } diff --git a/schemas/oic.wk.con-schema.json b/schemas/oic.wk.con-schema.json index 9c83ec4..dd032c2 100755 --- a/schemas/oic.wk.con-schema.json +++ b/schemas/oic.wk.con-schema.json @@ -8,6 +8,7 @@ "properties": { "n": { "type": "string", + "maxLength": 64, "description": "Human friendly name" }, "loc": { @@ -17,14 +18,17 @@ }, "locn": { "type": "string", + "maxLength": 64, "description": "Human Friendly Name" }, "c": { "type": "string", + "maxLength": 64, "description": "Currency" }, "r": { "type": "string", + "maxLength": 64, "description": "Region" } } @@ -32,7 +36,7 @@ }, "type": "object", "allOf": [ - {"$ref": "oic.core-schema.json#/definitions/oic.core"}, + { "$ref": "oic.core-schema.json#/definitions/oic.core"}, { "$ref": "#/definitions/oic.wk.con" } ], "required": [ "n" ] diff --git a/schemas/oic.wk.d-schema.json b/schemas/oic.wk.d-schema.json index 09fbcf3..8af0a11 100755 --- a/schemas/oic.wk.d-schema.json +++ b/schemas/oic.wk.d-schema.json @@ -8,6 +8,7 @@ "properties": { "n": { "type": "string", + "maxLength": 64, "description": "Readonly, Human friendly name" }, "di": { @@ -17,19 +18,26 @@ }, "icv": { "type": "string", + "maxLength": 64, "description": "ReadOnly, The version of the OIC Server" }, "dmv": { - "type": "string", - "description": "ReadOnly, The spec version of the vertical specification", - "format": "csv" + "type": "array", + "items" : [ + { + "type" : "string", + "maxLength": 64 + } + ], + "description": "ReadOnly, The spec version of the vertical specification" } } } }, "type": "object", "allOf": [ + { "$ref": "oic.core-schema.json#/definitions/oic.core"}, { "$ref": "#/definitions/oic.wk.d" } ], - "required": [ "n", "di", "icv" ] + "required": [ "n", "di", "icv", "dmv" ] } diff --git a/schemas/oic.wk.ifs-schema.json b/schemas/oic.wk.ifs-schema.json index 97c28dd..e35e85f 100755 --- a/schemas/oic.wk.ifs-schema.json +++ b/schemas/oic.wk.ifs-schema.json @@ -7,15 +7,21 @@ "type": "object", "properties": { "il": { - "type": "string", - "description": "Readonly, list of interface names", - "format": "bsv" + "type": "array", + "items" : [ + { + "type" : "string", + "enum" : ["oic.if.baseline", "oic.if.ll", "oic.if.b", "oic.if.lb", "oic.if.rw", "oic.if.r", "oic.if.a", "oic.if.s" ] + } + ], + "description": "Readonly, list of interface names" } } } }, "type": "object", "allOf": [ + { "$ref": "oic.core-schema.json#/definitions/oic.core"}, { "$ref": "#/definitions/oic.wk.ifs" } ], "required": ["il"] diff --git a/schemas/oic.wk.mnt-schema.json b/schemas/oic.wk.mnt-schema.json index b31662e..d64b43d 100755 --- a/schemas/oic.wk.mnt-schema.json +++ b/schemas/oic.wk.mnt-schema.json @@ -5,6 +5,12 @@ "definitions": { "oic.wk.mnt": { "type": "object", + "properties": { + "n": { + "type" : "string", + "maxLength" : 64, + "description": "Name" + }, "fr":{ "type": "boolean", "description": "Factory Reset" @@ -18,11 +24,12 @@ "description": "Start Stat Collection Action Toggle" } } + } }, "type": "object", "allOf": [ - {"$ref": "http://openconnectivityfoundation.org/core/oic.core-schema.json#/definitions/oic.core"}, - {"$ref": "#/definitions/oic.wk.mnt" } + { "$ref": "oic.core-schema.json#/definitions/oic.core"}, + { "$ref": "#/definitions/oic.wk.mnt" } ], - "required": ["fr", "rb", "ssc"] + "required": ["fr"] } diff --git a/schemas/oic.wk.mon-schema.json b/schemas/oic.wk.mon-schema.json index 654a5d0..6783e0a 100755 --- a/schemas/oic.wk.mon-schema.json +++ b/schemas/oic.wk.mon-schema.json @@ -15,9 +15,14 @@ "description": "ReadOnly, Indicates the elapsed time in seconds after the device was invoked or acted upon" }, "ds": { - "type": "string", - "description": "ReadOnly, Contains Device Statistics Info (no. of received packets, no. of sent packets, time to respond etc.)", - "format": "csv" + "type": "array", + "items" : [ + { + "type" : "string", + "maxLength": 64 + } + ], + "description": "ReadOnly, Contains Device Statistics Info (no. of received packets, no. of sent packets, time to respond etc.)" } } } diff --git a/schemas/oic.wk.p-schema.json b/schemas/oic.wk.p-schema.json index ee03b4f..09de7cf 100755 --- a/schemas/oic.wk.p-schema.json +++ b/schemas/oic.wk.p-schema.json @@ -8,59 +8,72 @@ "properties": { "pi": { "type": "string", + "format" : "uuid", "description": "ReadOnly, Platform Identifier" }, "mnmn": { "type": "string", "description": "ReadOnly, Manufacturer Name", - "maxLength": 16 + "maxLength": 64 }, "mnml": { "type": "string", "description": "ReadOnly, Manufacturer's URL", - "maxLength": 32, + "maxLength": 256, "format": "uri" }, "mnmo": { "type": "string", + "maxLength": 64, "description": "ReadOnly, Model number as designated by manufacturer" }, "mndt": { "type": "string", "description": "ReadOnly, Manufacturing Date", - "format": "date-time" + "format": "date" }, "mnpv": { "type": "string", + "maxLength": 64, "description": "ReadOnly, Platform Version" }, "mnos": { "type": "string", + "maxLength": 64, "description": "Readonly, Platform Resident OS Version" }, "mnhw": { "type": "string", + "maxLength": 64, "description": "Readonly, Platform Hardware Version" }, "mnfv": { "type": "string", + "maxLength": 64, "description": "ReadOnly, Manufacturer's firmware version" }, "mnsl": { "type": "string", "description": "ReadOnly, Manufacturer's Support Information URL", + "maxLength": 256, "format": "uri" }, "st": { "type": "string", "description": "ReadOnly, Reference time for the device", "format": "date-time" + }, + "vid": { + "type": "string", + "maxLength": 64, + "description": "ReadOnly, Manufacturer's defined string for the platform. The string is freeform and up to the manufacturer on what text to populate it" } } } }, "type": "object", "allOf": [ + { "$ref": "oic.core-schema.json#/definitions/oic.core"}, { "$ref": "#/definitions/oic.wk.p" } ], "required": [ "pi", "mnmn" ] diff --git a/schemas/oic.wk.ping-schema.json b/schemas/oic.wk.ping-schema.json index e80d8db..96f4b48 100755 --- a/schemas/oic.wk.ping-schema.json +++ b/schemas/oic.wk.ping-schema.json @@ -15,12 +15,8 @@ }, "type": "object", "allOf": [ - { - "$ref": "oic.core-schema.json#/definitions/oic.core" - }, - { - "$ref": "#/definitions/oic.wk.ping" - } + { "$ref": "oic.core-schema.json#/definitions/oic.core"}, + { "$ref": "#/definitions/oic.wk.ping"} ], "required": [ "in" diff --git a/schemas/oic.wk.res-schema.json b/schemas/oic.wk.res-schema.json index c84fbb7..aa486c4 100755 --- a/schemas/oic.wk.res-schema.json +++ b/schemas/oic.wk.res-schema.json @@ -3,26 +3,28 @@ "description" : "Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.", "id": "http://openconnectivityfoundation.org/core/schemas/oic.wk.res-schema.json#", "definitions": { - "oic.res-links-schema.json": { + "oic.res-links.json": { "type": "object", "properties": { "n": { "type": "string", + "maxLength": 64, "description": "ReadOnly, Human friendly name" }, "di": { "description": "The device identifier as indicated by the /oic/d resource of the device", "type": "string", - "format": "UUID" + "format": "uuid" }, "mpro": { "description": "ReadOnly, Supported messaging protocols", - "type": "string" + "type": "string", + "maxLength": 64 }, "links": { "type": "array", "items": { - "$ref": "oic.oic-link-schema.json#" + "$ref": "oic.oic-link-schema.json#/definitions/oic.oic-link" } } } @@ -31,7 +33,7 @@ "description": "The list of resources expressed as OIC links", "type": "array", "items": { - "$ref": "#/definitions/oic.res-links-schema.json" + "$ref": "#/definitions/oic.res-links.json" }, "required": ["di", "links"] } diff --git a/schemas/oic.wk.rts-schema.json b/schemas/oic.wk.rts-schema.json index 0a8950d..9edfeed 100755 --- a/schemas/oic.wk.rts-schema.json +++ b/schemas/oic.wk.rts-schema.json @@ -7,15 +7,21 @@ "type": "object", "properties": { "tl": { - "type": "string", - "description": "Readonly, list of resource type names", - "format": "bsv" + "type": "array", + "items" : [ + { + "type" : "string", + "maxLength": 64 + } + ], + "description": "Readonly, list of resource type names" } } } }, "type": "object", "allOf": [ + { "$ref": "oic.core-schema.json#/definitions/oic.core"}, { "$ref": "#/definitions/oic.wk.rts" } ], "required": ["tl"] From 03ce288c9a35d0d1ef55d4da9dd93d83138658fb Mon Sep 17 00:00:00 2001 From: rabardini Date: Thu, 23 Jun 2016 06:57:31 -0700 Subject: [PATCH 12/15] v1.1.0 --- oic.wk.con.raml | 14 ++--- oic.wk.d.raml | 15 ++--- oic.wk.ifs.raml | 14 ++--- oic.wk.mnt.raml | 12 ++-- oic.wk.mon.raml | 14 ++--- oic.wk.p.raml | 16 ++--- oic.wk.ping.raml | 14 ++--- oic.wk.res.raml | 28 +++++---- oic.wk.rts.raml | 14 ++--- rdpublish.raml | 33 +++++----- rules.raml | 12 ++-- scene.raml | 12 ++-- schemas/oic.core-schema.json | 9 --- schemas/oic.oic-link-schema.json | 63 ++++++++++++++----- schemas/oic.rule-Update-schema.json | 2 +- schemas/oic.rule-schema.json | 2 +- .../oic.sceneCollection-Update-schema.json | 6 +- schemas/oic.sceneCollection-schema.json | 6 +- schemas/oic.wk.con-schema.json | 3 +- schemas/oic.wk.d-schema.json | 15 ++--- schemas/oic.wk.p-schema.json | 4 +- schemas/oic.wk.res-schema.json | 10 +-- 22 files changed, 170 insertions(+), 148 deletions(-) diff --git a/oic.wk.con.raml b/oic.wk.con.raml index 391d25d..2bc4537 100755 --- a/oic.wk.con.raml +++ b/oic.wk.con.raml @@ -1,6 +1,6 @@ #%RAML 0.8 title: OIC Configuration -version: v1-20150807 +version: v1-20160622 documentation: - title: OCF Copyright @@ -13,19 +13,19 @@ documentation: schemas: - Configuration: !include schemas/oic.wk.con-schema.json - - + + traits: - interface: queryParameters: if: - enum: ["oic.if.rw"] + enum: ["oic.if.rw", "oic.if.baseline"] /oic/con: displayName: OIC Configuration is: [ interface ] description: | - Known resource that is hosted by every OIC Server. + Known resource that is hosted by every Server. Allows for device specific information to be configured. get: @@ -38,7 +38,7 @@ traits: schema: Configuration example: | { - "rt": "oic.wk.con", + "rt": ["oic.wk.con"], "n": "My Friendly Device Name", "loc": "My Location Information", "locn": "My Location Name", @@ -48,7 +48,7 @@ traits: post: description: | - Update the information about the OIC device + Update the information about the Device body: application/json: schema: Configuration diff --git a/oic.wk.d.raml b/oic.wk.d.raml index a0d76e5..9e51e49 100755 --- a/oic.wk.d.raml +++ b/oic.wk.d.raml @@ -1,6 +1,6 @@ #%RAML 0.8 title: OIC Root Device -version: v1-20150811 +version: v1-20160622 documentation: - title: OCF Copyright @@ -17,17 +17,17 @@ traits: - interface: queryParameters: if: - enum: ["oic.if.r"] + enum: ["oic.if.r", "oic.if.baseline"] /oic/d: - displayName: OIC Logical Device + displayName: Device is: [ interface ] description: | - Known resource that is hosted by every OIC Server. + Known resource that is hosted by every Server. Allows for logical device specific information to be discovered. get: description: | - Retrieve the information about the OIC device + Retrieve the information about the Device responses: 200: body: @@ -36,7 +36,8 @@ traits: example: | { "n": "Device 1", - "rt": "oic.wk.d", + "rt": ["oic.wk.d"], "di": "54919CA5-4101-4AE4-595B-353C51AA983C", - "icv": "OIC 1.0" + "icv": "core.1.1.0", + "dmv": "res.1.1.0" } diff --git a/oic.wk.ifs.raml b/oic.wk.ifs.raml index efb933e..4daa522 100755 --- a/oic.wk.ifs.raml +++ b/oic.wk.ifs.raml @@ -1,6 +1,6 @@ #%RAML 0.8 -title: OIC Interface Types -version: v1-20150811 +title: Interface Types +version: v1-20160622 documentation: - title: OCF Copyright @@ -17,13 +17,13 @@ traits: - interface: queryParameters: if: - enum: ["oic.if.r"] + enum: ["oic.if.r", "oic.if.baseline"] /oic/ifs: - displayName: OIC Inteface Types + displayName: Inteface Types is: [ interface ] description: | - List of resource interfaces that are supported by this OIC Server + List of resource interfaces that are supported by this Server get: description: Retrieve the resource interface list responses: @@ -33,6 +33,6 @@ traits: schema: IFS example: | { - "rt": "oic.wk.ifs", - "il": "oic.if.ll oic.if.bat oic.if.r" + "rt": ["oic.wk.ifs"], + "il": ["oic.if.ll", "oic.if.b", "oic.if.r"] } diff --git a/oic.wk.mnt.raml b/oic.wk.mnt.raml index 3cc575f..d2b5847 100755 --- a/oic.wk.mnt.raml +++ b/oic.wk.mnt.raml @@ -1,6 +1,6 @@ #%RAML 0.8 -title: OIC Maintenance -version: v1-20150811 +title: Maintenance +version: v1-20160622 documentation: - title: OCF Copyright @@ -17,13 +17,13 @@ traits: - interface: queryParameters: if: - enum: ["oic.if.r"] + enum: ["oic.if.r", "oic.if.baseline"] /oic/mnt: - displayName: OIC Maintenance + displayName: Maintenance is: [ interface ] description: | - The resource through which an OIC Device is maintained and can be used for diagnostic purposes. + The resource through which an Device is maintained and can be used for diagnostic purposes. fr (Factory Reset) is a boolean. The value 0 means No action (Default), the value 1 means Start Factory Reset After factory reset, this value shall be changed back to the default value @@ -45,7 +45,7 @@ traits: schema: MNT example: | { - "rt": "oic.wk.mnt", + "rt": ["oic.wk.mnt"], "n": "My Maintenance Actions", "fr": false, "rb": false, diff --git a/oic.wk.mon.raml b/oic.wk.mon.raml index ef9e54b..d3a6efa 100755 --- a/oic.wk.mon.raml +++ b/oic.wk.mon.raml @@ -1,6 +1,6 @@ #%RAML 0.8 -title: OIC Monitoring -version: v1-20150401 +title: Monitoring +version: v1-20160622 documentation: - title: OCF Copyright @@ -17,13 +17,13 @@ traits: - interface: queryParameters: if: - enum: ["oic.if.r"] + enum: ["oic.if.r", "oic.if.baseline"] /oic/mon: - displayName: OIC Monitoring + displayName: Monitoring is: [ interface ] description: | - The resource through which an OIC Device is monitored. + The resource through which an Device is monitored. get: description: Retrieve the monitor information responses: @@ -33,9 +33,9 @@ traits: schema: MON example: | { - "rt": "oic.wk.mon", + "rt": ["oic.wk.mon"], "name": "My Monitor Information", "av": true, "lat": 50, - "ds": "1500, 2750, 0" + "ds": ["1500", "2750", "0"] } diff --git a/oic.wk.p.raml b/oic.wk.p.raml index d0aa0bf..7b1f09a 100755 --- a/oic.wk.p.raml +++ b/oic.wk.p.raml @@ -1,6 +1,6 @@ #%RAML 0.8 -title: OIC Base Platform -version: v1-20150804 +title: Platform +version: v1-20160622 documentation: - title: OCF Copyright @@ -17,17 +17,17 @@ traits: - interface: queryParameters: if: - enum: ["oic.if.r"] + enum: ["oic.if.r", "oic.if.baseline"] /oic/p: - displayName: OIC Base Platform + displayName: Platform is: [ interface ] description: | - Known resource that is defines the platform on which an OIC Server is hosted. + Known resource that is defines the platform on which an Server is hosted. Allows for platform specific information to be discovered. get: description: | - Retrieve the information about the OIC Platform + Retrieve the information about the Platform responses: 200: @@ -36,7 +36,7 @@ traits: schema: Platform example: | { - "pi": "my-platform-identfier", - "rt": "oic.wk.p", + "pi": "54919CA5-4101-4AE4-595B-353C51AA983C", + "rt": ["oic.wk.p"], "mnmn": "Acme, Inc" } diff --git a/oic.wk.ping.raml b/oic.wk.ping.raml index b24e52e..87bdc94 100755 --- a/oic.wk.ping.raml +++ b/oic.wk.ping.raml @@ -1,6 +1,6 @@ #%RAML 0.8 -title: OIC Ping -version: v1-20150814 +title: Ping +version: v1-20160622 documentation: - title: OCF Copyright @@ -17,13 +17,13 @@ traits: - interface: queryParameters: if: - enum: ["oic.if.rw"] + enum: ["oic.if.rw", "oic.if.baseline"] /oic/ping: - displayName: OIC Ping + displayName: Ping is: [ interface ] description: | - The resource using which an OIC Client keeps its Connection with an OIC Server active. + The resource using which an Client keeps its Connection with an Server active. get: description: Retrieve the ping information responses: @@ -33,7 +33,7 @@ traits: schema: PING example: | { - "rt": "oic.wk.ping", - "name": "Ping Information", + "rt": ["oic.wk.ping"], + "n": "Ping Information", "in": 16 } diff --git a/oic.wk.res.raml b/oic.wk.res.raml index 7b2756d..8998d4d 100755 --- a/oic.wk.res.raml +++ b/oic.wk.res.raml @@ -1,6 +1,6 @@ #%RAML 0.8 -title: OIC Discoverable Resources -version: v1-20150807 +title: Discoverable Resources +version: v1-20160622 documentation: - title: OCF Copyright @@ -13,17 +13,18 @@ documentation: schemas: - Resources: !include schemas/oic.wk.res-schema.json + traits: - interface: queryParameters: if: - enum: ["oic.if.ll"] + enum: ["oic.if.ll", "oic.if.baseline"] /oic/res: - displayName: OIC Discoverable Resources + displayName: Discoverable Resources is: [ interface ] description: | - The resource through which the corresponding OIC Server is discovered and introspected for available resources. + The resource through which the corresponding Server is discovered and introspected for available resources. get: description: | Retrieve the discoverable resource set @@ -34,21 +35,24 @@ traits: application/json: schema: Resources example: | - [{ - "rt": "oic.wk.res", + [ + { + "rt": ["oic.wk.res"], "di": "0685B960-736F-46F7-BEC0-9E6CBD61ADC1", "links": [ { "href": "/res", "rel": "self", - "rt": "oic.r.collection", - "if": "oic.if.ll" }, + "rt": ["oic.r.collection"], + "if": ["oic.if.ll"] + }, { "href": "/smartDevice", "rel": "contained", - "rt": "oic.d.smartDevice", - "if": "oic.if.a" + "rt": ["oic.d.smartDevice"], + "if": ["oic.if.a"] } ] - }] + } + ] diff --git a/oic.wk.rts.raml b/oic.wk.rts.raml index 7fd052b..0af8b13 100755 --- a/oic.wk.rts.raml +++ b/oic.wk.rts.raml @@ -1,6 +1,6 @@ #%RAML 0.8 -title: OIC Resource Types -version: v1-20150811 +title: Resource Types +version: v1-20160622 documentation: - title: OCF Copyright @@ -17,14 +17,14 @@ traits: - interface: queryParameters: if: - enum: ["oic.if.r"] + enum: ["oic.if.r", "oic.if.baseline"] /oic/rts: - displayName: OIC Resource Types + displayName: Resource Types is: [ interface ] description: | - List of resource types that are supported by this OIC Server + List of resource types that are supported by this Server get: description: Retrieve the resource type list responses: @@ -34,6 +34,6 @@ traits: schema: RTS example: | { - "rt": "oic.wk.rts", - "tl": "oic.r.example oic.r.other-example" + "rt": ["oic.wk.rts"], + "tl": ["oic.r.example", "oic.r.other-example"] } diff --git a/rdpublish.raml b/rdpublish.raml index 07d7d0a..8a7f346 100755 --- a/rdpublish.raml +++ b/rdpublish.raml @@ -1,7 +1,7 @@ #%RAML 0.8 -#RAML for OIC Resource Directory +#RAML for Resource Directory title: Resource Directory -version: 1.0-090215 +version: v1-20160622 documentation: - title: OCF Copyright @@ -11,33 +11,32 @@ documentation: - title: OCF Disclaimer content: !include DISCLAIMER.md - - title: OIC Rsource Directory + - title: Resource Directory content: | - A Resoure Directory is an OIC Device that helps other OIC Devices to be discovered. + A Resoure Directory is an Device that helps other Devices to be discovered. - title: Introduction content: | - For resource in other OIC Devices to be discovered using the Resource Directory, these other devices have to publish the resource links they would otherwise have advertised through /oic/res to the Resource Directory. Once the information has been published then the OIC Devices may stop responding to discovery queries and may also go to sleep. + For resource in other Devices to be discovered using the Resource Directory, these other devices have to publish the resource links they would otherwise have advertised through /oic/res to the Resource Directory. Once the information has been published then the Devices may stop responding to discovery queries and may also go to sleep. The Resource Directory will respond to all discovery queries with resources that it directly advertises and also the resource information that has been published to it. - title: Resource Directory discovery content: | - Before an OIC Device publishes its resource information, it must first discover available Resource Directories and then select one of those to publish the information to. + Before a Device publishes its resource information, it must first discover available Resource Directories and then select one of those to publish the information to. - This doscovery is done with a multicast query to /oic/rd. The information returned is either a bais factor or a list of attributes that help the discovering OIC Device to select one of the RDs. This RD will be used till the RD does not respond or another RD is selected. + This doscovery is done with a multicast query to /oic/rd. The information returned is either a bais factor or a list of attributes that help the discovering Device to select one of the RDs. This RD will be used till the RD does not respond or another RD is selected. - title: Resource Directory publish content: | - Once the RD has been discovery and selected, the OIC Device can publish its resoure information. The resource information are published to the /oic/rd resource using the "publish" interface. The information that needs to tbe available in /oic/res is then populated by the Resource Directory. + Once the RD has been discovery and selected, the Device can publish its resoure information. The resource information are published to the /oic/rd resource using the "publish" interface. The information that needs to tbe available in /oic/res is then populated by the Resource Directory. - Periodically based on the TTL set by the publishing OIC Device, the information that is published has to be refreshed with a new TTL or the TTL can be updated if there is no change in the information. It is the responsibility of the publishing OIC Device to ensure that the information or TTL is updated before the previous TTL expires; failing this the RD will garbage collect all the information related to the publishing OIC Device. + Periodically based on the TTL set by the publishing Device, the information that is published has to be refreshed with a new TTL or the TTL can be updated if there is no change in the information. It is the responsibility of the publishing Device to ensure that the information or TTL is updated before the previous TTL expires; failing this the RD will garbage collect all the information related to the publishing Device. - title: Resource discovery content: | - The discovery of resources is done in the same manner as for any OIC Server. A query to /oic/res either over multicast or uincast is required. + The discovery of resources is done in the same manner as for any Server. A query to /oic/res either over multicast or uincast is required. schemas: -- # Each schema represents an OIC Resource Type. The baseline interface operates on the entire representation - rdPublish: !include schemas/oic.rd.publish-schema.json - rdSelection: !include schemas/oic.rd.selection-schema.json +- rdPublish: !include schemas/oic.rd.publish-schema.json +- rdSelection: !include schemas/oic.rd.selection-schema.json # rdDelLink: !include schemas/oic.rd.del-link-schema.json traits: @@ -45,7 +44,7 @@ traits: queryParameters: if: description: | - Interface is optional since there is only one interface supported for the OIC Resource Type + Interface is optional since there is only one interface supported for the Resource Type Both for RD selectin and for publish type: string enum: [ "oic.if.baseline" ] @@ -57,14 +56,14 @@ traits: /oic/rd: displayName: Resource directory resource description: | - Resource to be exposed by any OIC Device that can act as a Resource Directory + Resource to be exposed by any Device that can act as a Resource Directory get: description: | Get the attributes of the Resource Directory for selection purposes. queryParameters: rt: description: | - Only one OIC Resource Type is used for GET; OIC RT is optional + Only one Resource Type is used for GET; RT is optional type: string enum: [ "oic.wk.rd" ] default: "oic.wk.rd" @@ -94,7 +93,7 @@ traits: queryParameters: rt: description: | - Only one OIC Resource Type is used for GET; OIC RT is optional + Only one Resource Type is used for GET; RT is optional type: string enum: [ "oic.wk.rdpub" ] default: "oic.wk.rdpub" diff --git a/rules.raml b/rules.raml index 74f0e64..cf04214 100755 --- a/rules.raml +++ b/rules.raml @@ -1,6 +1,6 @@ #%RAML 0.8 -title: OICRules -version: v1.0-20150810 +title: Rules +version: v1-20160622 documentation: - title: OCF Copyright @@ -13,15 +13,15 @@ documentation: schemas: - Collection: !include schemas/oic.collection-schema.json - Rule: !include schemas/oic.rule-schema.json - RuleUpdate: !include schemas/oic.rule-Update-schema.json - RuleMember: !include schemas/oic.ruleMember-schema.json + - Rule: !include schemas/oic.rule-schema.json + - RuleUpdate: !include schemas/oic.rule-Update-schema.json + - RuleMember: !include schemas/oic.ruleMember-schema.json traits: - interface: queryParameters: if: - enum: ["oic.if.a", "oic.if.ll"] + enum: ["oic.if.a", "oic.if.ll", "oic.if.baseline"] /RuleListResURI: diff --git a/scene.raml b/scene.raml index 77fbedc..f59aabd 100755 --- a/scene.raml +++ b/scene.raml @@ -1,6 +1,6 @@ #%RAML 0.8 -title: OICScene -version: v1.0-20150630 +title: Scene +version: v1-20160622 documentation: - title: OCF Copyright @@ -13,15 +13,15 @@ documentation: schemas: - Collection: !include schemas/oic.collection-schema.json - SceneCollection: !include schemas/oic.sceneCollection-schema.json - SceneCollectionUpdate: !include schemas/oic.sceneCollection-Update-schema.json - SceneMember: !include schemas/oic.sceneMember-schema.json + - SceneCollection: !include schemas/oic.sceneCollection-schema.json + - SceneCollectionUpdate: !include schemas/oic.sceneCollection-Update-schema.json + - SceneMember: !include schemas/oic.sceneMember-schema.json traits: - interface: queryParameters: if: - enum: ["oic.if.a", "oic.if.ll"] + enum: ["oic.if.a", "oic.if.ll", "oic.if.baseline"] /SceneListResURI: diff --git a/schemas/oic.core-schema.json b/schemas/oic.core-schema.json index 40b03e4..29a5c33 100755 --- a/schemas/oic.core-schema.json +++ b/schemas/oic.core-schema.json @@ -29,15 +29,6 @@ "minItems": 1, "description": "ReadOnly, The interface set supported by this resource" }, - "p": { - "description": "ReadOnly, JSON object containing a Bitmap indicating observable and discoverable", - "type": "object", - "properties": { - "bm": { - "type": "integer" - } - } - }, "n": { "type": "string", "maxLength": 64, diff --git a/schemas/oic.oic-link-schema.json b/schemas/oic.oic-link-schema.json index ab7a159..55c6c4b 100755 --- a/schemas/oic.oic-link-schema.json +++ b/schemas/oic.oic-link-schema.json @@ -9,7 +9,7 @@ "href": { "type": "string", "maxLength": 256, - "description": "RFC5988 style web-links serialized into JSON. This is the target URI", + "description": "This is the target URI – 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": { @@ -40,15 +40,46 @@ "minItems": 1, "description": "ReadOnly, The interface set supported by this resource" }, + "di": { + "type": "string", + "description": "The Device ID on which the Relative Reference in href is to be resolved on. Base URI should be used in preference where possible", + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" + }, + "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": { - "description": "ReadOnly, JSON object containing a Bitmap indicating observable and discoverable", + "description": "ReadOnly, Specifies the framework policies on the Resource referenced by the target URI", "type": "object", "properties": { "bm": { + "description": "ReadOnly, Specifies the framework policies on the Resource referenced by the target URI for e.g. observable and discoverable", "type": "integer" - } + }, + "sec": { + "description": "ReadOnly, Specifies if security needs to be turned on when looking to interact with the Resource", + "type": "boolean" + }, + "port": { + "description": "ReadOnly, Secure port to be used for connection", + "type": "integer" + }, + "required" : ["bm"] } }, + "bp": { + "type": "object", + "properties": { + "q": { + "type": "string", + "maxLength": 64, + "description": "This defines the query string to be used when batch request is forwarded through this Link" + } + } + }, "title": { "type": "string", "maxLength": 64, @@ -74,28 +105,30 @@ }, { "type": "string", - "format": "uuid", + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", "description": "Use UUID for universal uniqueness - used in /oic/res to identify the device" } ], "description": "The instance identifier for this web link in an array of web links - used in collections" }, - "ttl": { - "type": "integer", - "description": "The time to live for this link in seconds - value is specified in a request only and is not returned on response. Max integer size to represent time is 4 octets" - }, "type": { - "type": "string", - "maxLength": 64, - "description": "A hint at the representation of the resource referenced by the target URI", - "default": "application/json" + "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" } - ], - "required": [ "href", "rt", "if" ] + ] } diff --git a/schemas/oic.rule-Update-schema.json b/schemas/oic.rule-Update-schema.json index 19ac15e..b7d563d 100755 --- a/schemas/oic.rule-Update-schema.json +++ b/schemas/oic.rule-Update-schema.json @@ -38,7 +38,7 @@ "description": "Array of OIC web links that are the rule members, this is the script", "items" : { "allOf": [ - { "$ref": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link-schema.json#" }, + { "$ref": "oic.oic-link-schema.json#/definitions/oic.oic-link" }, { "required" : [ "ins" ] } ] } diff --git a/schemas/oic.rule-schema.json b/schemas/oic.rule-schema.json index cd627a6..cabbe03 100755 --- a/schemas/oic.rule-schema.json +++ b/schemas/oic.rule-schema.json @@ -38,7 +38,7 @@ "description": "Array of OIC web links that are the rule members, this is the script", "items" : { "allOf": [ - { "$ref": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link-schema.json#" }, + { "$ref": "oic.oic-link-schema.json#/definitions/oic.oic-link#" }, { "required" : [ "ins" ] } ] } diff --git a/schemas/oic.sceneCollection-Update-schema.json b/schemas/oic.sceneCollection-Update-schema.json index 74a5931..969685c 100755 --- a/schemas/oic.sceneCollection-Update-schema.json +++ b/schemas/oic.sceneCollection-Update-schema.json @@ -23,8 +23,8 @@ "format": "UTF8" }, "id": { - "type": "string", - "description" : "A unique string that could be a hash or similarly unique" + "type": "string", + "description" : "A unique string that could be a hash or similarly unique" }, "rts": { "type": "string", @@ -36,7 +36,7 @@ "description": "Array of OIC web links that are reference from this collection", "items" : { "allOf": [ - { "$ref": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link-schema.json#" }, + { "$ref": "oic.oic-link-schema.json#/definitions/oic.oic-link" }, { "required" : [ "ins" ] } ] } diff --git a/schemas/oic.sceneCollection-schema.json b/schemas/oic.sceneCollection-schema.json index b73419b..c6d6fe8 100755 --- a/schemas/oic.sceneCollection-schema.json +++ b/schemas/oic.sceneCollection-schema.json @@ -23,8 +23,8 @@ "format": "UTF8" }, "id": { - "type": "string", - "description" : "A unique string that could be a hash or similarly unique" + "type": "string", + "description" : "A unique string that could be a hash or similarly unique" }, "rts": { "type": "string", @@ -36,7 +36,7 @@ "description": "Array of OIC web links that are reference from this collection", "items" : { "allOf": [ - { "$ref": "http://openconnectivityfoundation.org/core/schemas/oic.oic-link-schema.json#" }, + { "$ref": "oic.oic-link-schema.json#/definitions/oic.oic-link" }, { "required" : [ "ins" ] } ] } diff --git a/schemas/oic.wk.con-schema.json b/schemas/oic.wk.con-schema.json index dd032c2..7467e0b 100755 --- a/schemas/oic.wk.con-schema.json +++ b/schemas/oic.wk.con-schema.json @@ -13,8 +13,7 @@ }, "loc": { "type": "string", - "description": "Location information", - "format": "json" + "description": "Location information" }, "locn": { "type": "string", diff --git a/schemas/oic.wk.d-schema.json b/schemas/oic.wk.d-schema.json index 8af0a11..5c7ed16 100755 --- a/schemas/oic.wk.d-schema.json +++ b/schemas/oic.wk.d-schema.json @@ -13,8 +13,8 @@ }, "di": { "type": "string", - "description": "ReadOnly, Unique identifier for device (UUID)", - "format": "uuid" + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "description": "ReadOnly, Unique identifier for device (UUID)" }, "icv": { "type": "string", @@ -22,14 +22,9 @@ "description": "ReadOnly, The version of the OIC Server" }, "dmv": { - "type": "array", - "items" : [ - { - "type" : "string", - "maxLength": 64 - } - ], - "description": "ReadOnly, The spec version of the vertical specification" + "type": "string", + "maxLength": 64, + "description": "ReadOnly, The spec version of the vertical and/or resource specification" } } } diff --git a/schemas/oic.wk.p-schema.json b/schemas/oic.wk.p-schema.json index 09de7cf..af36a91 100755 --- a/schemas/oic.wk.p-schema.json +++ b/schemas/oic.wk.p-schema.json @@ -8,8 +8,8 @@ "properties": { "pi": { "type": "string", - "format" : "uuid", - "description": "ReadOnly, Platform Identifier" + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "description": "ReadOnly, Platform Identifier as a UUID" }, "mnmn": { "type": "string", diff --git a/schemas/oic.wk.res-schema.json b/schemas/oic.wk.res-schema.json index aa486c4..b06966b 100755 --- a/schemas/oic.wk.res-schema.json +++ b/schemas/oic.wk.res-schema.json @@ -12,9 +12,9 @@ "description": "ReadOnly, Human friendly name" }, "di": { - "description": "The device identifier as indicated by the /oic/d resource of the device", "type": "string", - "format": "uuid" + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "description": "ReadOnly, Unique identifier for device (UUID) as indicated by the /oic/d resource of the device" }, "mpro": { "description": "ReadOnly, Supported messaging protocols", @@ -27,13 +27,13 @@ "$ref": "oic.oic-link-schema.json#/definitions/oic.oic-link" } } - } + }, + "required": ["di", "links"] } }, "description": "The list of resources expressed as OIC links", "type": "array", "items": { "$ref": "#/definitions/oic.res-links.json" - }, - "required": ["di", "links"] + } } From 7134324c41f323e7f2e1a48cc031a6c13c88a69c Mon Sep 17 00:00:00 2001 From: rabardini Date: Thu, 7 Jul 2016 21:18:59 -0700 Subject: [PATCH 13/15] v1.1.0 - Added Pattern --- schemas/oic.wk.p-schema.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/schemas/oic.wk.p-schema.json b/schemas/oic.wk.p-schema.json index af36a91..a6cf1ad 100755 --- a/schemas/oic.wk.p-schema.json +++ b/schemas/oic.wk.p-schema.json @@ -29,8 +29,8 @@ }, "mndt": { "type": "string", - "description": "ReadOnly, Manufacturing Date", - "format": "date" + "description": "ReadOnly, Manufacturing Date as defined in ISO 8601, where the format is [yyyy]-[mm]-[dd].", + "pattern": "^([0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|2[0-9]|1[0-9]|0[1-9])$" }, "mnpv": { "type": "string", @@ -60,7 +60,8 @@ }, "st": { "type": "string", - "description": "ReadOnly, Reference time for the device", + "description": "ReadOnly, Reference time for the device as defined in ISO 8601, where concatenation of 'date' and 'time' with the 'T' as a delimiter between 'date' and 'time'. The format is [yyyy]-[mm]-[dd]T[hh]:[mm]:[ss]Z.", + "pattern": "^([0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|2[0-9]|1[0-9]|0[1-9])T(2[0-3]|1[0-9]|0[0-9]):([0-5][0-9]):([0-5][0-9])Z)$", "format": "date-time" }, "vid": { From df3b50ff1c9485b70ec4913911159a0f2b7453e9 Mon Sep 17 00:00:00 2001 From: rabardini Date: Tue, 12 Jul 2016 11:36:46 -0700 Subject: [PATCH 14/15] v1.1.0 - Fixed pattern syntax for mndt property. Added format for all uuids and date-time --- schemas/oic.wk.d-schema.json | 1 + schemas/oic.wk.res-schema.json | 1 + 2 files changed, 2 insertions(+) diff --git a/schemas/oic.wk.d-schema.json b/schemas/oic.wk.d-schema.json index 5c7ed16..6214c64 100755 --- a/schemas/oic.wk.d-schema.json +++ b/schemas/oic.wk.d-schema.json @@ -14,6 +14,7 @@ "di": { "type": "string", "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "format": "uuid", "description": "ReadOnly, Unique identifier for device (UUID)" }, "icv": { diff --git a/schemas/oic.wk.res-schema.json b/schemas/oic.wk.res-schema.json index b06966b..843d479 100755 --- a/schemas/oic.wk.res-schema.json +++ b/schemas/oic.wk.res-schema.json @@ -14,6 +14,7 @@ "di": { "type": "string", "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "format": "uuid", "description": "ReadOnly, Unique identifier for device (UUID) as indicated by the /oic/d resource of the device" }, "mpro": { From 26780a7a848d1e9c38cd9119cdb9f5ba406f7ded Mon Sep 17 00:00:00 2001 From: rabardini Date: Tue, 12 Jul 2016 11:38:05 -0700 Subject: [PATCH 15/15] v1.1.0 - Fixed pattern syntax for mndt property. Added format for all uuids and date-time --- schemas/oic.wk.p-schema.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/schemas/oic.wk.p-schema.json b/schemas/oic.wk.p-schema.json index a6cf1ad..decde5c 100755 --- a/schemas/oic.wk.p-schema.json +++ b/schemas/oic.wk.p-schema.json @@ -9,6 +9,7 @@ "pi": { "type": "string", "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "format": "uuid", "description": "ReadOnly, Platform Identifier as a UUID" }, "mnmn": { @@ -30,7 +31,8 @@ "mndt": { "type": "string", "description": "ReadOnly, Manufacturing Date as defined in ISO 8601, where the format is [yyyy]-[mm]-[dd].", - "pattern": "^([0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|2[0-9]|1[0-9]|0[1-9])$" + "pattern": "^([0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|2[0-9]|1[0-9]|0[1-9])$", + "format": "date-time" }, "mnpv": { "type": "string", @@ -61,7 +63,7 @@ "st": { "type": "string", "description": "ReadOnly, Reference time for the device as defined in ISO 8601, where concatenation of 'date' and 'time' with the 'T' as a delimiter between 'date' and 'time'. The format is [yyyy]-[mm]-[dd]T[hh]:[mm]:[ss]Z.", - "pattern": "^([0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|2[0-9]|1[0-9]|0[1-9])T(2[0-3]|1[0-9]|0[0-9]):([0-5][0-9]):([0-5][0-9])Z)$", + "pattern": "^([0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|2[0-9]|1[0-9]|0[1-9])T(2[0-3]|1[0-9]|0[0-9]):([0-5][0-9]):([0-5][0-9])Z$", "format": "date-time" }, "vid": {