Define Storage Description Resources as a specialization of CID-1.0

lws10-core/Discovery.html

@@ -40,7 +40,10 @@ <h4>Data Model</h4>
 
     <pre id="example-storage-description-minimal" class="example" title="Minimum storage description resource">
 {
-  "@context": "https://www.w3.org/ns/lws/v1",
+  "@context": [
+    "https://www.w3.org/ns/cid/v1",
+    "https://www.w3.org/ns/lws/v1"
+  ],
   "id": "https://storage.example/",
   "type": "Storage",
   "service": [{
@@ -96,13 +99,19 @@ <h4>Storage Services</h4>
     <h4>Storage Description Representation</h4>
 
     <p>
-      A <a>storage description resource</a> MUST be serializable with the media type <code>application/lws+json</code>.
+      A <a>storage description resource</a> is a specialization of a W3C Controlled Identifier document [[!CID-1.0]].
+      It MUST be serializable with the media type <code>application/lws+cid</code>.
+      The <code>@context</code> property MUST be an array starting with the URIs <code>https://www.w3.org/ns/cid/v1</code>
+      and <code>https://www.w3.org/ns/lws/v1</code>.
       Other representations MAY be available via content negotiation.
     </p>
 
     <pre id="example-storage-description-resource" class="example" title="Storage description resource">
 {
-  "@context": "https://www.w3.org/ns/lws/v1",
+  "@context": [
+    "https://www.w3.org/ns/cid/v1",
+    "https://www.w3.org/ns/lws/v1"
+  ],
   "id": "https://storage.example/",
   "type": "Storage",
   "capability": [{

lws10-core/IANA-Considerations.html

@@ -86,3 +86,27 @@ <h3>The <code>application/lws+json</code> Media Type</h3>
     <code>application/lws+json</code>.
   </p>
 </section>
+
+<section id="iana-media-type-cid-registry">
+  <h3>The <code>application/lws+cid</code> Media Type</h3>
+
+  <p>
+    This specification registers the <code>application/lws+cid</code> media type for identifying
+    storage description documents conforming to the Linked Web Storage protocol as a specialization
+    of the W3C Controlled Identifiers 1.0 document format.
+  </p>
+
+  <ul>
+    <li>Type name: application</li>
+    <li>Subtype name: lws+cid</li>
+    <li>Required parameters: None</li>
+    <li>
+      Encoding considerations: Resources that use the <code>application/lws+cid</code> media type
+      are required to conform to all of the requirements for the <code>application/json</code>
+      media type and are therefore subject to the same encoding considerations specified in
+      Section 11 of [[RFC8259]].
+    </li>
+    <li>Security considerations: As defined in this specification</li>
+    <li>Contact: W3C Linked Web Storage Working Group &lt;public-lws-wg@w3.org&gt;</li>
+  </ul>
+</section>

lws10-core/index.html

@@ -197,7 +197,7 @@ <h2>Terminology</h2>
         <li><dfn data-cite="webarch#def-resource">resource</dfn> &mdash; a resource is, as described by [[WebArch]] and [[RFC3986]], “whatever might be identified by a URI”. Resources whose essential characteristics can be conveyed in a message (such as web pages, images, structured data objects...) are called <dfn data-cite="webarch#def-information-resource">information resources</dfn> [[WebArch]].
         <li><dfn>storage</dfn> &mdash; a set of hierarchically organized HTTP resources whose lifecycle is managed by the conventions described by the Linked Web Storage Protocol. A storage is described by a <a>storage description resource</a> which references a collection of services that provide affordances over those resources.</li>
         <li><dfn>storage controller</dfn> &mdash; an <a>agent</a> that controls all resources in a <a>storage</a>.</li>
-        <li><dfn data-lt="storage description resource">storage description</dfn> &mdash; an <a>LWS resource</a> that enumerates and describes the <a>storage root</a> along with services and capabilities of a <a>storage</a>. Its representation conforms to the storage description data model.</li>
+        <li><dfn data-lt="storage description resource">storage description</dfn> &mdash; an <a>LWS resource</a>, conforming to the requirements of a W3C Controlled Identifier document [[!CID-1.0]], that enumerates and describes the <a>storage root</a> along with services and capabilities of a <a>storage</a>.</li>
         <li><dfn>storage root</dfn> &mdash; a <a>container</a> at the root of a <a>containment</a> hierarchy of a <a>storage</a>. The storage root is the only <a>LWS resource</a> that does not have a parent in the LWS <a>containment</a> hierarchy nor a <a>primary resource</a>.</li>
       </ul>
 

lws10-core/lws-media-type.md

@@ -1,6 +1,9 @@
 ### LWS Media Type
 
-LWS <a>container representation</a> and <a>storage description resource</a> MUST use the media type `application/lws+json`.
+An LWS <a>storage description resource</a> MUST support the media type `application/lws+cid`.
+The `application/lws+cid` media type identifies a document that is a specialization of a W3C Controlled Identifier document [[!CID-1.0]], extended with the LWS vocabulary.
+
+An LWS <a>container representation</a> MUST support the media type `application/lws+json`.
 
 While LWS container representations use JSON-LD conventions, the constraints and requirements for LWS justify the use of a specific media type. Because LWS containers can be considered a restricted profile of JSON-LD, implementations SHOULD consider the `application/ld+json; profile="https://www.w3.org/ns/lws/v1"` media type as equivalent to `application/lws+json`.
 

lws10-vocab/vocabulary.yml

@@ -8,8 +8,6 @@ prefix:
     value: https://www.w3.org/ns/activitystreams#
   - id: schema
     value: https://schema.org/
-  - id: sec
-    value: https://w3id.org/security#
   - id: ldp
     value: http://www.w3.org/ns/ldp#
 
@@ -93,16 +91,6 @@ property:
     domain: lws:Storage
     comment: A capability supported by the storage.
 
-  - id: service
-    label: service
-    domain: lws:Storage
-    comment: A service associated with the storage.
-
-  - id: serviceEndpoint
-    label: service endpoint
-    range: xsd:anyURI
-    comment: The URI of a service endpoint.
-
   - id: storageDescription
     label: storage description
     range: xsd:anyURI
@@ -175,22 +163,6 @@ property:
     range: xsd:dateTime
     comment: The date and time the activity was published.
 
-  - id: sec:verificationMethod
-    label: verification method
-    comment: A verification method associated with a key or identity.
-
-  - id: sec:authentication
-    label: authentication
-    comment: An authentication method associated with an identity.
-
-  - id: sec:controller
-    label: controller
-    comment: The entity that controls a verification method.
-
-  - id: sec:publicKeyJwk
-    label: public key JWK
-    comment: A public key expressed as a JSON Web Key.
-
   - id: ldp:inbox
     label: inbox
     range: xsd:anyURI