Update SR metaschema.

usnistgov · Dec 15, 2023 · b9312fd · b9312fd
1 parent 13705b9
commit b9312fd
Show file tree

Hide file tree

Showing 2 changed files with 189 additions and 286 deletions.
diff --git a/src/metaschema/oscal_responsibility-common_metaschema.xml b/src/metaschema/oscal_responsibility-common_metaschema.xml
@@ -12,8 +12,7 @@
    </remarks>
 
    <!-- IMPORT STATEMENTS -->
-   <import href="oscal_control-common_metaschema.xml"/>
-   <import href="oscal_implementation-common_metaschema.xml"/>
+   <import href="oscal_metadata_metaschema.xml"/>
 
   <!-- Shared Responsibility Assembly -->
 
@@ -32,11 +31,10 @@
         <description>This has not been described in the prototype.</description>
       </define-flag>
 
-      <!-- TODO: This flag causes a title error - I assume it is a conflict in borrowing the CDef or in the common files. -->
-      <!-- named to ssp-title just to support general prototype review. -->
-      <define-field required="no" name="ssp-title" as-type="markup-line">
-        <formal-name>Title</formal-name>
-        <description>This has not been described in the prototype.</description>
+      <!-- TODO: When this is named 'title' there is a duplicate key error. Unable to find the cause... -->
+      <define-field name="ssp-title" as-type="markup-line">
+        <formal-name>Source Title</formal-name>
+        <description>This has not been described in the prototype. See development note on the field name.</description>
       </define-field>
 
       <define-field name="published" as-type="dateTime-with-timezone">
@@ -54,16 +52,12 @@
         <description>This has not been described in the prototype.</description>
       </define-field>
 
-      <!-- TODO: This flag causes a title error - I assume it is a conflict in borrowing the CDef or in the common files. -->
-      <!-- <define-flag name="referenced-profile" as-type="uri-reference" required="no">
-        <formal-name>Referenced Profile</formal-name>
-        <description>This has not been described in the prototype.</description>
-      </define-flag> -->
+      <assembly ref="referenced-profile"/>
 
       <assembly ref="property" max-occurs="unbounded">
         <group-as name="props" in-json="ARRAY"/>
       </assembly>
-      
+
       <assembly ref="link" max-occurs="unbounded">
           <group-as name="links" in-json="ARRAY"/>
       </assembly>
@@ -73,6 +67,22 @@
 
   </define-assembly>
 
+  <define-assembly name="referenced-profile" max-occurs="1">
+    <formal-name>Referenced Profile</formal-name>
+    <description>This has not been described in the prototype.</description>
+    <define-flag name="href" as-type="uri-reference" required="yes">
+      <formal-name>Hyperlink Reference</formal-name>
+      <description>A link to a resource that defines a set of components and/or capabilities to import into this collection.</description>
+      <remarks>
+        <p>This value may be one of:</p>
+        <ol>
+          <li>an <a href="https://pages.nist.gov/OSCAL/concepts/uri-use/#absolute-uri">absolute URI</a> that points to a network resolvable resource,</li>
+          <li>a <a href="https://pages.nist.gov/OSCAL/concepts/uri-use/#relative-reference">relative reference</a> pointing to a network resolvable resource whose base URI is the URI of the containing document, or</li>
+          <li>a bare URI fragment (i.e., `#uuid`) pointing to a <code>back-matter</code> resource in this or an imported document (see <a href="https://pages.nist.gov/OSCAL/concepts/uri-use/#linking-to-another-oscal-object">linking to another OSCAL object</a>).</li>
+        </ol>
+      </remarks>
+    </define-flag>
+  </define-assembly>
 
   <define-assembly name="provided" max-occurs="unbounded">
     <formal-name>Provided Control Implementation</formal-name>