Adjust assemblies

usnistgov · Aug 23, 2023 · 070db28 · 070db28
1 parent 8302c2c
commit 070db28
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 13 deletions.
diff --git a/src/metaschema/oscal_component_metaschema.xml b/src/metaschema/oscal_component_metaschema.xml
@@ -422,10 +422,19 @@
           <p>The <code>implementation-status</code> is used to qualify the <code>status</code> value to indicate the degree to which the control is implemented.</p>
         </remarks>
       </assembly>
-      <assembly ref="provided"></assembly>
-      <assembly ref="responsibility"></assembly>
-      <assembly ref="inherited"></assembly>
-      <assembly ref="satisfied"></assembly>
+
+      <assembly ref="provided">
+        <group-as name="provided" in-json="ARRAY"/>
+      </assembly>
+      <assembly ref="responsibility">
+        <group-as name="responsibility" in-json="ARRAY"/>
+      </assembly>
+      <assembly ref="inherited">
+        <group-as name="inherited" in-json="ARRAY"/>
+      </assembly>
+      <assembly ref="satisfied">
+        <group-as name="satisfied" in-json="ARRAY"/>
+      </assembly>
 
       <assembly ref="export" max-occurs="1">
         <remarks>

diff --git a/src/metaschema/oscal_responsibility-common_metaschema.xml b/src/metaschema/oscal_responsibility-common_metaschema.xml
@@ -29,7 +29,7 @@
     </define-flag>
     <model>
       <flag ref="exportable" />
-      
+
       <define-field name="description" as-type="markup-multiline" min-occurs="1" in-xml="WITH_WRAPPER">
         <formal-name>Provided Control Implementation Description</formal-name>
         <description>An implementation statement that describes the aspects of the control or control statement implementation that can be provided to another system leveraging this system.</description>
@@ -199,10 +199,18 @@
         <!-- TODO: Model specific link relationships -->
       </assembly>
 
-      <assembly ref="provided"></assembly>
-      <assembly ref="responsibility"></assembly>
-      <assembly ref="inherited"></assembly>
-      <assembly ref="satisfied"></assembly>
+      <assembly ref="provided">
+        <group-as name="provided" in-json="ARRAY"/>
+      </assembly>
+      <assembly ref="responsibility">
+        <group-as name="responsibility" in-json="ARRAY"/>
+      </assembly>
+      <assembly ref="inherited">
+        <group-as name="inherited" in-json="ARRAY"/>
+      </assembly>
+      <assembly ref="satisfied">
+        <group-as name="satisfied" in-json="ARRAY"/>
+      </assembly>
 
       <field ref="remarks" in-xml="WITH_WRAPPER"/>
     </model>

diff --git a/src/metaschema/oscal_ssp_metaschema.xml b/src/metaschema/oscal_ssp_metaschema.xml
@@ -854,10 +854,18 @@
       </assembly>
 
       <!-- CHANGED from Export for CRM/SSRM: Shared Responsibility Assembly -->
-      <assembly ref="provided"></assembly>
-      <assembly ref="responsibility"></assembly>
-      <assembly ref="inherited"></assembly>
-      <assembly ref="satisfied"></assembly>
+      <assembly ref="provided">
+        <group-as name="provided" in-json="ARRAY"/>
+      </assembly>
+      <assembly ref="responsibility">
+        <group-as name="responsibility" in-json="ARRAY"/>
+      </assembly>
+      <assembly ref="inherited">
+        <group-as name="inherited" in-json="ARRAY"/>
+      </assembly>
+      <assembly ref="satisfied">
+        <group-as name="satisfied" in-json="ARRAY"/>
+      </assembly>
 
       <assembly ref="export" max-occurs="1">
         <remarks>