Adjustments to align with Metaschema schema bug fixes. (usnistgov#1805)

Compton-US · Jul 10, 2023 · d8c6f61 · d8c6f61
1 parent 5e9e348
commit d8c6f61
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/metaschema/oscal_control-common_metaschema.xml b/src/metaschema/oscal_control-common_metaschema.xml
@@ -238,10 +238,10 @@
                         </constraint>
                 </define-flag>
                 <model>
-                        <define-field name="parameter-choice" as-type="markup-line" max-occurs="unbounded">
+                        <define-field name="choice" as-type="markup-line" max-occurs="unbounded">
                                 <formal-name>Choice</formal-name>
-                                <description>A value selection among several such options</description>
-                                <use-name>choice</use-name>
+                                <description>A value selection among several such
+                                        options.</description>
                                 <json-value-key>value</json-value-key>
                                 <!-- CHANGED "alternatives" to "choices" -->
                                 <group-as name="choice" in-json="ARRAY"/>

diff --git a/src/metaschema/oscal_implementation-common_metaschema.xml b/src/metaschema/oscal_implementation-common_metaschema.xml
@@ -649,11 +649,10 @@
             <description>Identifies the parameter that will be set by the enclosed value.</description>
             <flag ref="param-id" required="yes"/>
             <model>
-                  <define-field name="parameter-value" as-type="string" min-occurs="1" max-occurs="unbounded">
+                  <define-field name="value" as-type="string" min-occurs="1" max-occurs="unbounded">
                         <!-- CHANGED type from "markup-line" to "string" since this is intended to be a scalar value -->
                         <formal-name>Parameter Value</formal-name>
                         <description>A parameter value or set of values.</description>
-                        <use-name>value</use-name>
                         <group-as name="values" in-json="ARRAY"/>
                   </define-field>
                   <field ref="remarks" in-xml="WITH_WRAPPER"/>