From 5749ad1ed8cacd248efb7073af41b302901291ab Mon Sep 17 00:00:00 2001 From: david-waltermire-nist Date: Sun, 21 Aug 2022 02:47:08 +0000 Subject: [PATCH] Publishing generated metaschema resources [ci skip] --- ...cal_assessment-plan_xml-to-json-converter.xsl | 12 ++++++++++++ ..._assessment-results_xml-to-json-converter.xsl | 12 ++++++++++++ .../oscal_catalog_xml-to-json-converter.xsl | 12 ++++++++++++ .../oscal_complete_xml-to-json-converter.xsl | 12 ++++++++++++ .../oscal_component_xml-to-json-converter.xsl | 12 ++++++++++++ .../oscal_mapping_xml-to-json-converter.xsl | 12 ++++++++++++ .../convert/oscal_poam_xml-to-json-converter.xsl | 12 ++++++++++++ .../oscal_profile_xml-to-json-converter.xsl | 12 ++++++++++++ json/convert/oscal_ssp_xml-to-json-converter.xsl | 12 ++++++++++++ json/schema/oscal_assessment-plan_schema.json | 4 ++++ json/schema/oscal_assessment-results_schema.json | 4 ++++ json/schema/oscal_catalog_schema.json | 8 ++++++-- json/schema/oscal_complete_schema.json | 8 ++++++-- json/schema/oscal_component_schema.json | 4 ++++ json/schema/oscal_mapping_schema.json | 8 ++++++-- json/schema/oscal_poam_schema.json | 4 ++++ json/schema/oscal_profile_schema.json | 4 ++++ json/schema/oscal_ssp_schema.json | 4 ++++ ...cal_assessment-plan_json-to-xml-converter.xsl | 13 +++++++++++++ ..._assessment-results_json-to-xml-converter.xsl | 13 +++++++++++++ .../oscal_catalog_json-to-xml-converter.xsl | 13 +++++++++++++ .../oscal_complete_json-to-xml-converter.xsl | 13 +++++++++++++ .../oscal_component_json-to-xml-converter.xsl | 13 +++++++++++++ .../oscal_mapping_json-to-xml-converter.xsl | 13 +++++++++++++ xml/convert/oscal_poam_json-to-xml-converter.xsl | 13 +++++++++++++ .../oscal_profile_json-to-xml-converter.xsl | 13 +++++++++++++ xml/convert/oscal_ssp_json-to-xml-converter.xsl | 13 +++++++++++++ xml/schema/oscal_assessment-plan_schema.xsd | 10 ++++++++++ xml/schema/oscal_assessment-results_schema.xsd | 10 ++++++++++ xml/schema/oscal_catalog_schema.xsd | 16 +++++++++++++--- xml/schema/oscal_complete_schema.xsd | 16 +++++++++++++--- xml/schema/oscal_component_schema.xsd | 10 ++++++++++ xml/schema/oscal_mapping_schema.xsd | 16 +++++++++++++--- xml/schema/oscal_poam_schema.xsd | 10 ++++++++++ xml/schema/oscal_profile_schema.xsd | 10 ++++++++++ xml/schema/oscal_ssp_schema.xsd | 10 ++++++++++ 36 files changed, 366 insertions(+), 15 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 index 276ea99eaf..cd149ddadb 100644 --- a/json/convert/oscal_assessment-plan_xml-to-json-converter.xsl +++ b/json/convert/oscal_assessment-plan_xml-to-json-converter.xsl @@ -188,6 +188,7 @@ + @@ -1210,6 +1211,17 @@ + + + + + diff --git a/json/convert/oscal_assessment-results_xml-to-json-converter.xsl b/json/convert/oscal_assessment-results_xml-to-json-converter.xsl index d459ede185..ee43bae3b7 100644 --- a/json/convert/oscal_assessment-results_xml-to-json-converter.xsl +++ b/json/convert/oscal_assessment-results_xml-to-json-converter.xsl @@ -180,6 +180,7 @@ + @@ -1668,6 +1669,17 @@ + + + + + diff --git a/json/convert/oscal_catalog_xml-to-json-converter.xsl b/json/convert/oscal_catalog_xml-to-json-converter.xsl index e6db7db99f..074f599465 100644 --- a/json/convert/oscal_catalog_xml-to-json-converter.xsl +++ b/json/convert/oscal_catalog_xml-to-json-converter.xsl @@ -190,6 +190,7 @@ + @@ -872,6 +873,17 @@ + + + + + diff --git a/json/convert/oscal_complete_xml-to-json-converter.xsl b/json/convert/oscal_complete_xml-to-json-converter.xsl index 2663bd9176..bcb4cc42b8 100644 --- a/json/convert/oscal_complete_xml-to-json-converter.xsl +++ b/json/convert/oscal_complete_xml-to-json-converter.xsl @@ -190,6 +190,7 @@ + @@ -2975,6 +2976,17 @@ + + + + + diff --git a/json/convert/oscal_component_xml-to-json-converter.xsl b/json/convert/oscal_component_xml-to-json-converter.xsl index e630632c4c..575225bf0f 100644 --- a/json/convert/oscal_component_xml-to-json-converter.xsl +++ b/json/convert/oscal_component_xml-to-json-converter.xsl @@ -192,6 +192,7 @@ + @@ -677,6 +678,17 @@ + + + + + diff --git a/json/convert/oscal_mapping_xml-to-json-converter.xsl b/json/convert/oscal_mapping_xml-to-json-converter.xsl index 2a2e20da12..2ad08821ab 100644 --- a/json/convert/oscal_mapping_xml-to-json-converter.xsl +++ b/json/convert/oscal_mapping_xml-to-json-converter.xsl @@ -178,6 +178,7 @@ + @@ -649,6 +650,17 @@ + + + + + diff --git a/json/convert/oscal_poam_xml-to-json-converter.xsl b/json/convert/oscal_poam_xml-to-json-converter.xsl index e4064079fb..7993ee2b5c 100644 --- a/json/convert/oscal_poam_xml-to-json-converter.xsl +++ b/json/convert/oscal_poam_xml-to-json-converter.xsl @@ -195,6 +195,7 @@ + @@ -1191,6 +1192,17 @@ + + + + + diff --git a/json/convert/oscal_profile_xml-to-json-converter.xsl b/json/convert/oscal_profile_xml-to-json-converter.xsl index 47a70380bf..4f67324198 100644 --- a/json/convert/oscal_profile_xml-to-json-converter.xsl +++ b/json/convert/oscal_profile_xml-to-json-converter.xsl @@ -178,6 +178,7 @@ + @@ -797,6 +798,17 @@ + + + + + diff --git a/json/convert/oscal_ssp_xml-to-json-converter.xsl b/json/convert/oscal_ssp_xml-to-json-converter.xsl index 1982064062..6c5b3c200a 100644 --- a/json/convert/oscal_ssp_xml-to-json-converter.xsl +++ b/json/convert/oscal_ssp_xml-to-json-converter.xsl @@ -175,6 +175,7 @@ + @@ -1082,6 +1083,17 @@ + + + + + diff --git a/json/schema/oscal_assessment-plan_schema.json b/json/schema/oscal_assessment-plan_schema.json index 15de0b50cb..c8245af5f9 100644 --- a/json/schema/oscal_assessment-plan_schema.json +++ b/json/schema/oscal_assessment-plan_schema.json @@ -506,6 +506,10 @@ { "title" : "Property Class", "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.", "$ref" : "#/definitions/TokenDatatype" }, + "group" : + { "title" : "Property Group", + "description" : "An identifier for relating distinct sets of properties.", + "$ref" : "#/definitions/TokenDatatype" }, "remarks" : { "$ref" : "#field_oscal-metadata_remarks" } }, "required" : diff --git a/json/schema/oscal_assessment-results_schema.json b/json/schema/oscal_assessment-results_schema.json index c06b908971..fd2f06759a 100644 --- a/json/schema/oscal_assessment-results_schema.json +++ b/json/schema/oscal_assessment-results_schema.json @@ -736,6 +736,10 @@ { "title" : "Property Class", "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.", "$ref" : "#/definitions/TokenDatatype" }, + "group" : + { "title" : "Property Group", + "description" : "An identifier for relating distinct sets of properties.", + "$ref" : "#/definitions/TokenDatatype" }, "remarks" : { "$ref" : "#field_oscal-metadata_remarks" } }, "required" : diff --git a/json/schema/oscal_catalog_schema.json b/json/schema/oscal_catalog_schema.json index 8e4a05e4f2..da1c077274 100644 --- a/json/schema/oscal_catalog_schema.json +++ b/json/schema/oscal_catalog_schema.json @@ -760,6 +760,10 @@ { "title" : "Property Class", "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.", "$ref" : "#/definitions/TokenDatatype" }, + "group" : + { "title" : "Property Group", + "description" : "An identifier for relating distinct sets of properties.", + "$ref" : "#/definitions/TokenDatatype" }, "remarks" : { "$ref" : "#field_oscal-metadata_remarks" } }, "required" : @@ -1040,8 +1044,8 @@ [ "control", "statement" ] } ] }, "id-ref" : - { "title" : "Subject Type", - "description" : "The semantic type of the subject.", + { "title" : "Subject Identifier Reference", + "description" : "A reference to an identified subject that is of the specified type.", "$ref" : "#/definitions/StringDatatype" }, "props" : { "type" : "array", diff --git a/json/schema/oscal_complete_schema.json b/json/schema/oscal_complete_schema.json index e17dd4d87d..3d098c89c0 100644 --- a/json/schema/oscal_complete_schema.json +++ b/json/schema/oscal_complete_schema.json @@ -760,6 +760,10 @@ { "title" : "Property Class", "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.", "$ref" : "#/definitions/TokenDatatype" }, + "group" : + { "title" : "Property Group", + "description" : "An identifier for relating distinct sets of properties.", + "$ref" : "#/definitions/TokenDatatype" }, "remarks" : { "$ref" : "#field_oscal-metadata_remarks" } }, "required" : @@ -1040,8 +1044,8 @@ [ "control", "statement" ] } ] }, "id-ref" : - { "title" : "Subject Type", - "description" : "The semantic type of the subject.", + { "title" : "Subject Identifier Reference", + "description" : "A reference to an identified subject that is of the specified type.", "$ref" : "#/definitions/StringDatatype" }, "props" : { "type" : "array", diff --git a/json/schema/oscal_component_schema.json b/json/schema/oscal_component_schema.json index c118204cdd..3bb46dae6d 100644 --- a/json/schema/oscal_component_schema.json +++ b/json/schema/oscal_component_schema.json @@ -1051,6 +1051,10 @@ { "title" : "Property Class", "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.", "$ref" : "#/definitions/TokenDatatype" }, + "group" : + { "title" : "Property Group", + "description" : "An identifier for relating distinct sets of properties.", + "$ref" : "#/definitions/TokenDatatype" }, "remarks" : { "$ref" : "#field_oscal-metadata_remarks" } }, "required" : diff --git a/json/schema/oscal_mapping_schema.json b/json/schema/oscal_mapping_schema.json index bf7c2493fb..db6a939c73 100644 --- a/json/schema/oscal_mapping_schema.json +++ b/json/schema/oscal_mapping_schema.json @@ -479,6 +479,10 @@ { "title" : "Property Class", "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.", "$ref" : "#/definitions/TokenDatatype" }, + "group" : + { "title" : "Property Group", + "description" : "An identifier for relating distinct sets of properties.", + "$ref" : "#/definitions/TokenDatatype" }, "remarks" : { "$ref" : "#field_oscal-metadata_remarks" } }, "required" : @@ -759,8 +763,8 @@ [ "control", "statement" ] } ] }, "id-ref" : - { "title" : "Subject Type", - "description" : "The semantic type of the subject.", + { "title" : "Subject Identifier Reference", + "description" : "A reference to an identified subject that is of the specified type.", "$ref" : "#/definitions/StringDatatype" }, "props" : { "type" : "array", diff --git a/json/schema/oscal_poam_schema.json b/json/schema/oscal_poam_schema.json index 3ceab3f009..09e7285b18 100644 --- a/json/schema/oscal_poam_schema.json +++ b/json/schema/oscal_poam_schema.json @@ -565,6 +565,10 @@ { "title" : "Property Class", "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.", "$ref" : "#/definitions/TokenDatatype" }, + "group" : + { "title" : "Property Group", + "description" : "An identifier for relating distinct sets of properties.", + "$ref" : "#/definitions/TokenDatatype" }, "remarks" : { "$ref" : "#field_oscal-metadata_remarks" } }, "required" : diff --git a/json/schema/oscal_profile_schema.json b/json/schema/oscal_profile_schema.json index af7fbaeddd..ef7bdfeb79 100644 --- a/json/schema/oscal_profile_schema.json +++ b/json/schema/oscal_profile_schema.json @@ -814,6 +814,10 @@ { "title" : "Property Class", "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.", "$ref" : "#/definitions/TokenDatatype" }, + "group" : + { "title" : "Property Group", + "description" : "An identifier for relating distinct sets of properties.", + "$ref" : "#/definitions/TokenDatatype" }, "remarks" : { "$ref" : "#field_oscal-metadata_remarks" } }, "required" : diff --git a/json/schema/oscal_ssp_schema.json b/json/schema/oscal_ssp_schema.json index 48fc6c9adb..8b56e1eb69 100644 --- a/json/schema/oscal_ssp_schema.json +++ b/json/schema/oscal_ssp_schema.json @@ -1297,6 +1297,10 @@ { "title" : "Property Class", "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.", "$ref" : "#/definitions/TokenDatatype" }, + "group" : + { "title" : "Property Group", + "description" : "An identifier for relating distinct sets of properties.", + "$ref" : "#/definitions/TokenDatatype" }, "remarks" : { "$ref" : "#field_oscal-metadata_remarks" } }, "required" : diff --git a/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl b/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl index 67dbacb47b..08702529b5 100644 --- a/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl +++ b/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl @@ -142,6 +142,7 @@ + @@ -699,6 +700,18 @@ + + + + + + + @@ -925,6 +926,18 @@ + + + + + + + @@ -518,6 +519,18 @@ + + + + + + + @@ -1585,6 +1586,18 @@ + + + + + + + @@ -450,6 +451,18 @@ + + + + + + + @@ -441,6 +442,18 @@ + + + + + + + @@ -706,6 +707,18 @@ + + + + + + + @@ -508,6 +509,18 @@ + + + + + + + @@ -683,6 +684,18 @@ + + + + + + Property Class: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. + + + + Property Group + An identifier for relating distinct sets of properties. + + + Property Group: An identifier for relating distinct sets of properties. + + diff --git a/xml/schema/oscal_assessment-results_schema.xsd b/xml/schema/oscal_assessment-results_schema.xsd index f2f559d2d8..8ee67e0a93 100644 --- a/xml/schema/oscal_assessment-results_schema.xsd +++ b/xml/schema/oscal_assessment-results_schema.xsd @@ -1327,6 +1327,16 @@ Property Class: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. + + + + Property Group + An identifier for relating distinct sets of properties. + + + Property Group: An identifier for relating distinct sets of properties. + + diff --git a/xml/schema/oscal_catalog_schema.xsd b/xml/schema/oscal_catalog_schema.xsd index ae63aa40b2..6dbeffafa2 100644 --- a/xml/schema/oscal_catalog_schema.xsd +++ b/xml/schema/oscal_catalog_schema.xsd @@ -1329,6 +1329,16 @@ Property Class: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. + + + + Property Group + An identifier for relating distinct sets of properties. + + + Property Group: An identifier for relating distinct sets of properties. + + @@ -1832,11 +1842,11 @@ - Subject Type - The semantic type of the subject. + Subject Identifier Reference + A reference to an identified subject that is of the specified type. - Subject Type: The semantic type of the subject. + Subject Identifier Reference: A reference to an identified subject that is of the specified type. diff --git a/xml/schema/oscal_complete_schema.xsd b/xml/schema/oscal_complete_schema.xsd index 55dcbf0af4..96975fb8ef 100644 --- a/xml/schema/oscal_complete_schema.xsd +++ b/xml/schema/oscal_complete_schema.xsd @@ -1336,6 +1336,16 @@ Property Class: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. + + + + Property Group + An identifier for relating distinct sets of properties. + + + Property Group: An identifier for relating distinct sets of properties. + + @@ -1839,11 +1849,11 @@ - Subject Type - The semantic type of the subject. + Subject Identifier Reference + A reference to an identified subject that is of the specified type. - Subject Type: The semantic type of the subject. + Subject Identifier Reference: A reference to an identified subject that is of the specified type. diff --git a/xml/schema/oscal_component_schema.xsd b/xml/schema/oscal_component_schema.xsd index f690eb7fc6..0efd3c55a8 100644 --- a/xml/schema/oscal_component_schema.xsd +++ b/xml/schema/oscal_component_schema.xsd @@ -1892,6 +1892,16 @@ Property Class: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. + + + + Property Group + An identifier for relating distinct sets of properties. + + + Property Group: An identifier for relating distinct sets of properties. + + diff --git a/xml/schema/oscal_mapping_schema.xsd b/xml/schema/oscal_mapping_schema.xsd index 4ee462849e..b5b1054a34 100644 --- a/xml/schema/oscal_mapping_schema.xsd +++ b/xml/schema/oscal_mapping_schema.xsd @@ -855,6 +855,16 @@ Property Class: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. + + + + Property Group + An identifier for relating distinct sets of properties. + + + Property Group: An identifier for relating distinct sets of properties. + + @@ -1358,11 +1368,11 @@ - Subject Type - The semantic type of the subject. + Subject Identifier Reference + A reference to an identified subject that is of the specified type. - Subject Type: The semantic type of the subject. + Subject Identifier Reference: A reference to an identified subject that is of the specified type. diff --git a/xml/schema/oscal_poam_schema.xsd b/xml/schema/oscal_poam_schema.xsd index 26893e17bb..9a803bbe1a 100644 --- a/xml/schema/oscal_poam_schema.xsd +++ b/xml/schema/oscal_poam_schema.xsd @@ -1010,6 +1010,16 @@ Property Class: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. + + + + Property Group + An identifier for relating distinct sets of properties. + + + Property Group: An identifier for relating distinct sets of properties. + + diff --git a/xml/schema/oscal_profile_schema.xsd b/xml/schema/oscal_profile_schema.xsd index 01883f7e04..9b3c3364ae 100644 --- a/xml/schema/oscal_profile_schema.xsd +++ b/xml/schema/oscal_profile_schema.xsd @@ -1377,6 +1377,16 @@ Property Class: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. + + + + Property Group + An identifier for relating distinct sets of properties. + + + Property Group: An identifier for relating distinct sets of properties. + + diff --git a/xml/schema/oscal_ssp_schema.xsd b/xml/schema/oscal_ssp_schema.xsd index 33fd2193af..e2c3869de3 100644 --- a/xml/schema/oscal_ssp_schema.xsd +++ b/xml/schema/oscal_ssp_schema.xsd @@ -2293,6 +2293,16 @@ Property Class: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. + + + + Property Group + An identifier for relating distinct sets of properties. + + + Property Group: An identifier for relating distinct sets of properties. + +