Posting up-to-date schema and converters.

usnistgov · Jun 8, 2021 · 6246c5f · 6246c5f
1 parent 67a9b70
commit 6246c5f
Show file tree

Hide file tree

Showing 24 changed files with 21,911 additions and 13,461 deletions.
diff --git a/json/convert/oscal_assessment-plan_xml-to-json-converter.xsl b/json/convert/oscal_assessment-plan_xml-to-json-converter.xsl
diff --git a/json/convert/oscal_assessment-results_xml-to-json-converter.xsl b/json/convert/oscal_assessment-results_xml-to-json-converter.xsl
diff --git a/json/convert/oscal_catalog_xml-to-json-converter.xsl b/json/convert/oscal_catalog_xml-to-json-converter.xsl
diff --git a/json/convert/oscal_complete_xml-to-json-converter.xsl b/json/convert/oscal_complete_xml-to-json-converter.xsl
diff --git a/json/convert/oscal_component_xml-to-json-converter.xsl b/json/convert/oscal_component_xml-to-json-converter.xsl
diff --git a/json/convert/oscal_poam_xml-to-json-converter.xsl b/json/convert/oscal_poam_xml-to-json-converter.xsl
diff --git a/json/convert/oscal_profile_xml-to-json-converter.xsl b/json/convert/oscal_profile_xml-to-json-converter.xsl
diff --git a/json/convert/oscal_ssp_xml-to-json-converter.xsl b/json/convert/oscal_ssp_xml-to-json-converter.xsl
diff --git a/json/schema/oscal_assessment-plan_schema.json b/json/schema/oscal_assessment-plan_schema.json
diff --git a/json/schema/oscal_assessment-results_schema.json b/json/schema/oscal_assessment-results_schema.json
diff --git a/json/schema/oscal_complete_schema.json b/json/schema/oscal_complete_schema.json
diff --git a/json/schema/oscal_poam_schema.json b/json/schema/oscal_poam_schema.json
diff --git a/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl b/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl
diff --git a/xml/convert/oscal_assessment-results_json-to-xml-converter.xsl b/xml/convert/oscal_assessment-results_json-to-xml-converter.xsl
diff --git a/xml/convert/oscal_catalog_json-to-xml-converter.xsl b/xml/convert/oscal_catalog_json-to-xml-converter.xsl
diff --git a/xml/convert/oscal_complete_json-to-xml-converter.xsl b/xml/convert/oscal_complete_json-to-xml-converter.xsl
diff --git a/xml/convert/oscal_component_json-to-xml-converter.xsl b/xml/convert/oscal_component_json-to-xml-converter.xsl
diff --git a/xml/convert/oscal_poam_json-to-xml-converter.xsl b/xml/convert/oscal_poam_json-to-xml-converter.xsl
diff --git a/xml/convert/oscal_profile_json-to-xml-converter.xsl b/xml/convert/oscal_profile_json-to-xml-converter.xsl
diff --git a/xml/convert/oscal_ssp_json-to-xml-converter.xsl b/xml/convert/oscal_ssp_json-to-xml-converter.xsl
diff --git a/xml/schema/oscal_assessment-plan_schema.xsd b/xml/schema/oscal_assessment-plan_schema.xsd
@@ -2652,30 +2652,53 @@
                      minOccurs="0"
                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
-            <xs:simpleType>
+            <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Objective Status</m:formal-name>
-                     <m:description>A brief indication as to whether the objective is satisfied or not within a given system.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Objective Status</b>: A brief indication as to whether the objective is satisfied or not within a given system.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="oscal-ap:token"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="reason" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Objective Status Reason</m:formal-name>
-                     <m:description>The reason the objective was given it's status.</m:description>
+                     <m:description>A determination of if the objective is satisfied or not within a given system.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Objective Status Reason</b>: The reason the objective was given it's status.</xs:documentation>
+                     <b>Objective Status</b>: A determination of if the objective is satisfied or not within a given system.</xs:documentation>
                </xs:annotation>
-               <xs:restriction base="xs:NCName"/>
-            </xs:simpleType>
+               <xs:sequence>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary on the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="oscal-ap:blockElementGroup"
+                                  maxOccurs="unbounded"
+                                  minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="state" use="required" type="oscal-ap:token">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Objective Status State</m:formal-name>
+                        <m:description>An indication as to whether the objective is satisfied or not.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Objective Status State</b>: An indication as to whether the objective is satisfied or not.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="reason" type="oscal-ap:token">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Objective Status Reason</m:formal-name>
+                        <m:description>The reason the objective was given it's status.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Objective Status Reason</b>: The reason the objective was given it's status.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
          </xs:element>
          <xs:element name="implementation-status"
                      type="oscal-ap:oscal-implementation-common-implementation-status-ASSEMBLY"

diff --git a/xml/schema/oscal_assessment-results_schema.xsd b/xml/schema/oscal_assessment-results_schema.xsd
@@ -3085,30 +3085,53 @@
                      minOccurs="0"
                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
-            <xs:simpleType>
+            <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Objective Status</m:formal-name>
-                     <m:description>A brief indication as to whether the objective is satisfied or not within a given system.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Objective Status</b>: A brief indication as to whether the objective is satisfied or not within a given system.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="oscal-ar:token"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="reason" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Objective Status Reason</m:formal-name>
-                     <m:description>The reason the objective was given it's status.</m:description>
+                     <m:description>A determination of if the objective is satisfied or not within a given system.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Objective Status Reason</b>: The reason the objective was given it's status.</xs:documentation>
+                     <b>Objective Status</b>: A determination of if the objective is satisfied or not within a given system.</xs:documentation>
                </xs:annotation>
-               <xs:restriction base="xs:NCName"/>
-            </xs:simpleType>
+               <xs:sequence>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary on the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="oscal-ar:blockElementGroup"
+                                  maxOccurs="unbounded"
+                                  minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="state" use="required" type="oscal-ar:token">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Objective Status State</m:formal-name>
+                        <m:description>An indication as to whether the objective is satisfied or not.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Objective Status State</b>: An indication as to whether the objective is satisfied or not.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="reason" type="oscal-ar:token">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Objective Status Reason</m:formal-name>
+                        <m:description>The reason the objective was given it's status.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Objective Status Reason</b>: The reason the objective was given it's status.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
          </xs:element>
          <xs:element name="implementation-status"
                      type="oscal-ar:oscal-implementation-common-implementation-status-ASSEMBLY"

diff --git a/xml/schema/oscal_complete_schema.xsd b/xml/schema/oscal_complete_schema.xsd
@@ -6447,30 +6447,53 @@
                      minOccurs="0"
                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
-            <xs:simpleType>
+            <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Objective Status</m:formal-name>
-                     <m:description>A brief indication as to whether the objective is satisfied or not within a given system.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Objective Status</b>: A brief indication as to whether the objective is satisfied or not within a given system.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="oscal-complete:token"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="reason" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Objective Status Reason</m:formal-name>
-                     <m:description>The reason the objective was given it's status.</m:description>
+                     <m:description>A determination of if the objective is satisfied or not within a given system.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Objective Status Reason</b>: The reason the objective was given it's status.</xs:documentation>
+                     <b>Objective Status</b>: A determination of if the objective is satisfied or not within a given system.</xs:documentation>
                </xs:annotation>
-               <xs:restriction base="xs:NCName"/>
-            </xs:simpleType>
+               <xs:sequence>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary on the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="oscal-complete:blockElementGroup"
+                                  maxOccurs="unbounded"
+                                  minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="state" use="required" type="oscal-complete:token">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Objective Status State</m:formal-name>
+                        <m:description>An indication as to whether the objective is satisfied or not.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Objective Status State</b>: An indication as to whether the objective is satisfied or not.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="reason" type="oscal-complete:token">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Objective Status Reason</m:formal-name>
+                        <m:description>The reason the objective was given it's status.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Objective Status Reason</b>: The reason the objective was given it's status.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
          </xs:element>
          <xs:element name="implementation-status"
                      type="oscal-complete:oscal-implementation-common-implementation-status-ASSEMBLY"

diff --git a/xml/schema/oscal_poam_schema.xsd b/xml/schema/oscal_poam_schema.xsd
@@ -3707,30 +3707,53 @@
                      minOccurs="0"
                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
-            <xs:simpleType>
+            <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Objective Status</m:formal-name>
-                     <m:description>A brief indication as to whether the objective is satisfied or not within a given system.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Objective Status</b>: A brief indication as to whether the objective is satisfied or not within a given system.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="oscal-poam:token"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="reason" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Objective Status Reason</m:formal-name>
-                     <m:description>The reason the objective was given it's status.</m:description>
+                     <m:description>A determination of if the objective is satisfied or not within a given system.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Objective Status Reason</b>: The reason the objective was given it's status.</xs:documentation>
+                     <b>Objective Status</b>: A determination of if the objective is satisfied or not within a given system.</xs:documentation>
                </xs:annotation>
-               <xs:restriction base="xs:NCName"/>
-            </xs:simpleType>
+               <xs:sequence>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary on the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="oscal-poam:blockElementGroup"
+                                  maxOccurs="unbounded"
+                                  minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="state" use="required" type="oscal-poam:token">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Objective Status State</m:formal-name>
+                        <m:description>An indication as to whether the objective is satisfied or not.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Objective Status State</b>: An indication as to whether the objective is satisfied or not.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="reason" type="oscal-poam:token">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Objective Status Reason</m:formal-name>
+                        <m:description>The reason the objective was given it's status.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Objective Status Reason</b>: The reason the objective was given it's status.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
          </xs:element>
          <xs:element name="implementation-status"
                      type="oscal-poam:oscal-implementation-common-implementation-status-ASSEMBLY"