OpenInterConnect · rabardini · Mar 7, 2016 · Mar 7, 2016 · Mar 7, 2016 · Mar 7, 2016
diff --git a/DISCLAIMER.md b/DISCLAIMER.md
@@ -0,0 +1 @@
+THIS SOFTWARE IS PROVIDED BY THE OPEN CONNECTIVITY FOUNDATION, INC. "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE OR WARRANTIES OF NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE OPEN CONNECTIVITY FOUNDATION, INC. OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/LICENSE.md b/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.
diff --git a/oic.core.json b/oic.core.json
diff --git a/oic.oic-link.json b/oic.oic-link.json
diff --git a/oic.wk.con.raml b/oic.wk.con.raml
@@ -1,30 +1,31 @@
 #%RAML 0.8
 title: OIC Configuration
-version: v1-20150807
+version: v1-20160622
 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: OCF Copyright
+    content: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.
+  - title: OCF License
+    content: !include LICENSE.md
+  - title: OCF Disclaimer
+    content: !include DISCLAIMER.md
+
 
 schemas:
-  - Configuration: !include oic.wk.con.json
-  
-        
+  - 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:
@@ -37,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",
@@ -47,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
@@ -1,32 +1,33 @@
 #%RAML 0.8
 title: OIC Root Device
-version: v1-20150811
+version: v1-20160622
 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: OCF Copyright
+    content: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.
+  - title: OCF License
+    content: !include LICENSE.md
+  - title: OCF Disclaimer
+    content: !include DISCLAIMER.md
+
 
 schemas:
-  - Device: !include oic.wk.d.json
+  - Device: !include schemas/oic.wk.d-schema.json
 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:
@@ -35,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.json b/oic.wk.ifs.json
diff --git a/oic.wk.ifs.raml b/oic.wk.ifs.raml
@@ -1,28 +1,29 @@
 #%RAML 0.8
-title: OIC Interface Types
-version: v1-20150811
+title: Interface Types
+version: v1-20160622
 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: OCF Copyright
+    content: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.
+  - title: OCF License
+    content: !include LICENSE.md
+  - title: OCF Disclaimer
+    content: !include DISCLAIMER.md
+
 
 schemas:
-  - IFS: !include oic.wk.ifs.json
+  - IFS: !include schemas/oic.wk.ifs-schema.json
 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:
@@ -32,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
@@ -1,28 +1,29 @@
 #%RAML 0.8
-title: OIC Maintenance
-version: v1-20150811
+title: Maintenance
+version: v1-20160622
 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: OCF Copyright
+    content: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.
+  - title: OCF License
+    content: !include LICENSE.md
+  - title: OCF Disclaimer
+    content: !include DISCLAIMER.md
+
 
 schemas:
-  - MNT: !include oic.wk.mnt.json
+  - MNT: !include schemas/oic.wk.mnt-schema.json
 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
@@ -44,7 +45,7 @@ traits:
             schema: MNT
             example: |
               {
-                "rt":   "oic.wk.mnt",
+                "rt":   ["oic.wk.mnt"],
                 "n":    "My Maintenance Actions",
                 "fr":   false,
                 "rb":   false,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		THIS SOFTWARE IS PROVIDED BY THE OPEN CONNECTIVITY FOUNDATION, INC. "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE OR WARRANTIES OF NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE OPEN CONNECTIVITY FOUNDATION, INC. OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.