Small improvements and corrections in metaschema sources accompanying u…

…snistgov/metaschema#119

src/metaschema/oscal_assessment-common_metaschema.xml

@@ -286,15 +286,15 @@
             <description>The timing under which the task is intended to occur.</description>
             <model>
                <choice>
-                  <define-field name="on-date" as-type="empty" min-occurs="1">
+                  <define-assembly name="on-date" min-occurs="1">
                      <formal-name>On Date Condition</formal-name>
                      <description>The task is intended to occur on the specified date.</description>
                      <define-flag name="date" as-type="dateTime-with-timezone" required="yes">
                         <formal-name>On Date Condition</formal-name>
                         <description>The task must occur on the specified date.</description>
                      </define-flag>
-                  </define-field>
-                  <define-field name="within-date-range" as-type="empty" min-occurs="1">
+                  </define-assembly>
+                  <define-assembly name="within-date-range" min-occurs="1">
                      <formal-name>On Date Range Condition</formal-name>
                      <description>The task is intended to occur within the specified date range.</description>
                      <define-flag name="start" as-type="dateTime-with-timezone" required="yes">
@@ -305,8 +305,8 @@
                         <formal-name>End Date Condition</formal-name>
                         <description>The task must occur on or before the specified date.</description>
                      </define-flag>
-                  </define-field>
-                  <define-field name="at-frequency" as-type="empty" min-occurs="1">
+                  </define-assembly>
+                  <define-assembly name="at-frequency" min-occurs="1">
                      <formal-name>Frequency Condition</formal-name>
                      <description>The task is intended to occur at the specified frequency.</description>
                      <define-flag name="period" as-type="positiveInteger" required="yes">
@@ -327,14 +327,14 @@
                            </allowed-values>
                         </constraint>
                      </define-flag>
-                  </define-field>
+                  </define-assembly>
                </choice>
             </model>
          </define-assembly>
          <define-assembly name="dependency" max-occurs="unbounded">
             <formal-name>Task Dependency</formal-name>
             <description>Used to indicate that a task is dependant on another task.</description>
-            <group-as name="dependencies"/>
+            <group-as name="dependencies" in-json="ARRAY"/>
             <define-flag name="task-uuid" required="yes" as-type="uuid">
                <formal-name>Task Universally Unique Identifier Reference</formal-name>
                <description>References a unique task by UUID.</description>
@@ -446,11 +446,11 @@
                </assembly>
                <choice>
                   <!-- CHANGED: "all" to "include-all" -->
-                  <define-field name="include-all" as-type="empty" min-occurs="1">
+                  <define-assembly name="include-all" min-occurs="1">
                      <!-- CHANGED: type to "empty" -->
                      <formal-name>All</formal-name>
                      <description>A key word to indicate all.</description>
-                  </define-field>
+                  </define-assembly>
                   <assembly ref="select-control-by-id" min-occurs="1" max-occurs="unbounded">
                      <use-name>include-control</use-name>
                      <group-as name="include-controls" in-json="ARRAY"/>
@@ -496,26 +496,26 @@
                </assembly>
                <choice>
                   <!-- CHANGED: "all" to "include-all" -->
-                  <define-field name="include-all" as-type="empty" min-occurs="1">
+                  <define-assembly name="include-all" min-occurs="1">
                      <!-- CHANGED: type to "empty" -->
                      <formal-name>All</formal-name>
                      <description>A key word to indicate all.</description>
-                  </define-field>
-                  <field ref="select-objective-by-id" min-occurs="1" max-occurs="unbounded">
+                  </define-assembly>
+                  <assembly ref="select-objective-by-id" min-occurs="1" max-occurs="unbounded">
                      <use-name>include-objective</use-name>
                      <group-as name="include-objectives" in-json="ARRAY"/>
                      <remarks>
                         <p>Used to select a control objective for inclusion by the control objective's identifier.</p>
                      </remarks>
-                  </field>
+                  </assembly>
                </choice>
-               <field ref="select-objective-by-id" max-occurs="unbounded">
+               <assembly ref="select-objective-by-id" max-occurs="unbounded">
                   <use-name>exclude-objective</use-name>
                   <group-as name="exclude-objectives" in-json="ARRAY"/>
                   <remarks>
                      <p>Used to select a control objective for exclusion by the control objective's identifier.</p>
                   </remarks>
-               </field>
+               </assembly>
                <field ref="remarks" in-xml="WITH_WRAPPER" min-occurs="0" max-occurs="1"/>
             </model>
             <remarks>
@@ -546,11 +546,11 @@
       </model>
    </define-assembly>
 
-   <define-field name="select-objective-by-id" as-type="empty">
+   <define-assembly name="select-objective-by-id">
       <formal-name>Select Objective</formal-name>
       <description>Used to select a control objective for inclusion/exclusion based on the control objective's identifier.</description>
       <flag ref="objective-id" required="yes"/>
-   </define-field>
+   </define-assembly>
 
    <!-- ********** ASSESSMENT SUBJECT Assembly ********** -->
    <define-assembly name="assessment-subject-placeholder">
@@ -565,15 +565,15 @@
             <formal-name>Assessment Subject Placeholder Description</formal-name>
             <description>A human-readable description of intent of this assessment subject placeholder.</description>
          </define-field>
-         <define-field name="source" as-type="empty" min-occurs="1" max-occurs="unbounded">
+         <define-assembly name="source" min-occurs="1" max-occurs="unbounded">
             <formal-name>Assessment Subject Source</formal-name>
             <description>Assessment subjects will be identified while conducting the referenced activity-instance.</description>
             <group-as name="sources" in-json="ARRAY"/>
             <define-flag name="task-uuid" required="yes" as-type="uuid">
                <formal-name>Task Universally Unique Identifier</formal-name>
                <description>Uniquely identifies an assessment activity to be performed as part of the event. This UUID may be referenced elsewhere in an OSCAL document when refering to this information. A UUID should be consistantly used for this schedule across revisions of the document.</description>
             </define-flag>
-         </define-field>
+         </define-assembly>
          <field ref="property" min-occurs="0" max-occurs="unbounded">
             <group-as name="props" in-json="ARRAY"/>
          </field>
@@ -620,11 +620,11 @@
          </assembly>
          <choice>
             <!-- CHANGED: "all" to "include-all" -->
-            <define-field name="include-all" as-type="empty" min-occurs="1">
+            <define-assembly name="include-all" min-occurs="1">
                <!-- CHANGED: type to "empty" -->
                <formal-name>All</formal-name>
                <description>A key word to indicate all.</description>
-            </define-field>
+            </define-assembly>
             <assembly ref="select-subject-by-id" min-occurs="1" max-occurs="unbounded">
                <use-name>include-subject</use-name>
                <!-- CHANGED: "includes" to "include-subjects" -->
@@ -1255,9 +1255,9 @@
                      <assembly ref="link" max-occurs="unbounded">
                         <group-as name="links" in-json="ARRAY"/>
                      </assembly>
-                     <field ref="logged-by" max-occurs="unbounded">
+                     <assembly ref="logged-by" max-occurs="unbounded">
                         <group-as name="logged-by" in-json="ARRAY"/>
-                     </field>
+                     </assembly>
                      <field ref="risk-status">
                         <use-name>status-change</use-name>
                         <remarks>
@@ -1365,15 +1365,15 @@
          </define-assembly>
 -->
          <!-- CHANGE: Added to relate a risk to an observation -->
-         <define-field name="related-observation" as-type="empty" max-occurs="unbounded">
+         <define-assembly name="related-observation" max-occurs="unbounded">
             <formal-name>Related Observation</formal-name>
             <description>Relates the finding to a set of referenced observations that were used to determine the finding.</description>
             <group-as name="related-observations" in-json="ARRAY"/>
             <define-flag name="observation-uuid" as-type="uuid" required="yes">
                <formal-name>Observation Universally Unique Identifier Reference</formal-name>
                <description>References an observation defined in the list of observations.</description>
             </define-flag>
-         </define-field>
+         </define-assembly>
 
          <!-- QUESTION: ** (PROP) PRIORITY NEEDS TO BE ADDRESSED HERE, NOT ELSEWHERE ** -->
          <!-- CHANGED: "removed "party-uuid" and replaced with "origin" -->
@@ -1389,7 +1389,7 @@
       </constraint>
    </define-assembly>
 
-   <define-field name="logged-by" as-type="empty">
+   <define-assembly name="logged-by">
       <formal-name>Logged By</formal-name>
       <description>Used to indicate who created a log entry in what role.</description>
       <define-flag name="party-uuid" as-type="uuid" required="yes">
@@ -1400,7 +1400,7 @@
          <formal-name>Actor Role</formal-name>
          <description>A point to the role-id of the role in which the party is making the log entry.</description>
       </define-flag>
-   </define-field>
+   </define-assembly>
 
    <define-field name="risk-status" as-type="NCName">
       <!-- CHANGED: from "risk-status" to "status" -->
@@ -1853,7 +1853,7 @@
          <assembly ref="annotation" max-occurs="unbounded">
             <group-as name="annotations" in-json="ARRAY"/>
          </assembly>
-         <define-field name="prose" as-type="markup-multiline" in-xml="UNWRAPPED" min-occurs="1">
+         <define-field name="prose" as-type="markup-multiline" in-xml="UNWRAPPED" min-occurs="0">
             <!-- QUESTION: Is this the right name? -->
             <formal-name>Part Text</formal-name>
             <description>Permits multiple paragraphs, lists, tables etc.</description>

src/metaschema/oscal_assessment-plan_metaschema.xml

@@ -73,7 +73,7 @@
             <description>Used to define various terms and conditions under which an assessment, described by the plan, can be performed. Each child part defines a different type of term or condition.</description>
             <model>
                <assembly ref="assessment-part" max-occurs="unbounded">
-                  <group-as name="parts"/>
+                  <group-as name="parts" in-json="ARRAY"/>
                </assembly>
             </model>
             <constraint>

src/metaschema/oscal_assessment-results_metaschema.xml

@@ -213,9 +213,9 @@
                      <assembly ref="link" max-occurs="unbounded">
                         <group-as name="links" in-json="ARRAY"/>
                      </assembly>
-                     <field ref="logged-by" max-occurs="unbounded">
+                     <assembly ref="logged-by" max-occurs="unbounded">
                         <group-as name="logged-by" in-json="ARRAY"/>
-                     </field>
+                     </assembly>
                      <!-- CHANGED: Added "related-task" -->
                      <assembly ref="related-task" max-occurs="unbounded">
                         <group-as name="related-tasks" in-json="ARRAY"/>
@@ -286,25 +286,25 @@
             <description>Identifies the implementation statement in the SSP to which this finding is related.</description>
          </define-field>
          <!-- CHANGED: replaced embedded observation with references -->
-         <define-field name="related-observation" as-type="empty" max-occurs="unbounded">
+         <define-assembly name="related-observation" max-occurs="unbounded">
             <formal-name>Related Observation</formal-name>
             <description>Relates the finding to a set of referenced observations that were used to determine the finding.</description>
             <group-as name="related-observations" in-json="ARRAY"/>
             <define-flag name="observation-uuid" as-type="uuid" required="yes">
                <formal-name>Observation Universally Unique Identifier Reference</formal-name>
                <description>References an observation defined in the list of observations.</description>
             </define-flag>
-         </define-field>
+         </define-assembly>
          <!-- CHANGED: replaced "risk" with new "assciated-risk" -->
-         <define-field name="associated-risk" as-type="empty" max-occurs="unbounded">
+         <define-assembly name="associated-risk" max-occurs="unbounded">
             <formal-name>Associated Risk</formal-name>
             <description>Relates the finding to a set of referenced risks that were used to determine the finding.</description>
             <group-as name="related-risks" in-json="ARRAY"/>
             <define-flag name="risk-uuid" as-type="uuid" required="yes">
                <formal-name>Risk Universally Unique Identifier Reference</formal-name>
                <description>References an risk defined in the list of risks.</description>
             </define-flag>
-         </define-field>
+         </define-assembly>
          <field ref="remarks" in-xml="WITH_WRAPPER" min-occurs="0" max-occurs="1"/>
       </model>
    </define-assembly>

src/metaschema/oscal_catalog_metaschema.xml

@@ -108,7 +108,7 @@
                <group-as name="controls" in-json="ARRAY"/>
             </assembly>
          </choice>
-         <any/>
+         <!--<any/>-->
       </model>
       <constraint>
          <!-- CHANGE: added allowed values for a property/@name -->

src/metaschema/oscal_component_metaschema.xml

@@ -35,9 +35,9 @@
       </define-flag>
       <model>
          <assembly ref="metadata" min-occurs="1"/>
-         <field ref="import-component-definition" max-occurs="unbounded">
+         <assembly ref="import-component-definition" max-occurs="unbounded">
             <group-as name="import-component-definitions" in-json="ARRAY"/>
-         </field>
+         </assembly>
          <assembly ref="defined-component" max-occurs="unbounded">
             <use-name>component</use-name>
             <group-as name="components" in-json="BY_KEY"/>
@@ -54,14 +54,14 @@
       </constraint>
    </define-assembly>
 
-   <define-field name="import-component-definition" as-type="empty">
+   <define-assembly name="import-component-definition">
       <formal-name>Import Component Definition</formal-name>
       <description>Loads a component definition from another resource.</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>
       </define-flag>
-   </define-field>
+   </define-assembly>
 
    <define-assembly name="defined-component">
       <formal-name>Component</formal-name>

src/metaschema/oscal_implementation-common_metaschema.xml

@@ -271,12 +271,12 @@
             <formal-name>title field</formal-name>
             <description>A human readable name for the protocol (e.g., Transport Layer Security).</description>
          </define-field>
-         <field ref="port-range" max-occurs="unbounded">
+         <assembly ref="port-range" max-occurs="unbounded">
             <group-as name="port-ranges" in-json="ARRAY"/>
-         </field>
+         </assembly>
       </model>
    </define-assembly>
-   <define-field name="port-range" as-type="empty">
+   <define-assembly name="port-range">
       <formal-name>Port Range</formal-name>
       <description>Where applicable this is the IPv4 port range on which the service operates.</description>
       <define-flag name="start" as-type="nonNegativeInteger">
@@ -315,7 +315,7 @@
             </protocol>
          </service>
       </example>
-   </define-field>
+   </define-assembly>
 
    <!-- ############################################# -->
    <!-- # The System User and supporting constructs # -->

src/metaschema/oscal_poam_metaschema.xml

@@ -123,26 +123,26 @@
          <!-- CHANGED: removed "objective-status" per brianrufgsa -->
          <!-- CHANGED: (per Brian) removed "implementation-statement-uuid" since this is in the SAR -->
          <!-- CHANGED: replaced embedded observation with references -->
-         <define-field name="related-observation" as-type="empty" max-occurs="unbounded">
+         <define-assembly name="related-observation" max-occurs="unbounded">
             <formal-name>Related Observation</formal-name>
             <description>Relates the poam-item to a set of referenced observations that were used to determine the finding.</description>
             <group-as name="related-observations" in-json="ARRAY"/>
             <define-flag name="observation-uuid" as-type="uuid" required="yes">
                <formal-name>Observation Universally Unique Identifier Reference</formal-name>
                <description>References an observation defined in the list of observations.</description>
             </define-flag>
-         </define-field>
+         </define-assembly>
 
          <!-- CHANGED: replaced "risk" with new "assciated-risk" -->
-         <define-field name="associated-risk" as-type="empty" max-occurs="unbounded">
+         <define-assembly name="associated-risk" max-occurs="unbounded">
             <formal-name>Associated Risk</formal-name>
             <description>Relates the finding to a set of referenced risks that were used to determine the finding.</description>
             <group-as name="related-risks" in-json="ARRAY"/>
             <define-flag name="risk-uuid" as-type="uuid" required="yes">
                <formal-name>Risk Universally Unique Identifier Reference</formal-name>
                <description>References an risk defined in the list of risks.</description>
             </define-flag>
-         </define-field>
+         </define-assembly>
          <field ref="remarks"
                 in-xml="WITH_WRAPPER"
                 min-occurs="0"