Publishing generated metaschema resources [ci skip]

aj-stein-nist · Feb 6, 2023 · a425697 · a425697
1 parent 337cb5b
commit a425697
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 8 deletions.
diff --git a/json/convert/oscal_complete_xml-to-json-converter.xsl b/json/convert/oscal_complete_xml-to-json-converter.xsl
@@ -1080,12 +1080,13 @@
    <xsl:template match="remove"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="remove" gi="remove">
+      <assembly name="remove" gi="remove">
          <xsl:apply-templates select="@by-name"/>
          <xsl:apply-templates select="@by-class"/>
          <xsl:apply-templates select="@by-id"/>
          <xsl:apply-templates select="@by-item-name"/>
          <xsl:apply-templates select="@by-ns"/>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="add" xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
@@ -1122,6 +1123,7 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition"

diff --git a/json/convert/oscal_profile_xml-to-json-converter.xsl b/json/convert/oscal_profile_xml-to-json-converter.xsl
@@ -673,12 +673,13 @@
    <xsl:template match="remove"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="remove" gi="remove">
+      <assembly name="remove" gi="remove">
          <xsl:apply-templates select="@by-name"/>
          <xsl:apply-templates select="@by-class"/>
          <xsl:apply-templates select="@by-id"/>
          <xsl:apply-templates select="@by-item-name"/>
          <xsl:apply-templates select="@by-ns"/>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="add" xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
@@ -715,6 +716,7 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="back-matter"

diff --git a/json/schema/oscal_complete_schema.json b/json/schema/oscal_complete_schema.json
@@ -1485,7 +1485,9 @@
           "by-ns" : 
           { "title" : "Item Namespace Reference",
             "description" : "Identify items to remove by the item's ns, which is the namespace associated with a part, or prop.",
-            "$ref" : "#/definitions/TokenDatatype" } },
+            "$ref" : "#/definitions/TokenDatatype" },
+          "remarks" : 
+          { "$ref" : "#field_oscal-metadata_remarks" } },
         "additionalProperties" : false },
       "oscal-complete-oscal-profile:add" : 
       { "title" : "Addition",
@@ -1532,7 +1534,9 @@
           { "type" : "array",
             "minItems" : 1,
             "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } } },
+            { "$ref" : "#assembly_oscal-catalog-common_part" } },
+          "remarks" : 
+          { "$ref" : "#field_oscal-metadata_remarks" } },
         "additionalProperties" : false },
       "oscal-complete-oscal-component-definition:component-definition" : 
       { "title" : "Component Definition",

diff --git a/json/schema/oscal_profile_schema.json b/json/schema/oscal_profile_schema.json
@@ -342,7 +342,9 @@
           "by-ns" : 
           { "title" : "Item Namespace Reference",
             "description" : "Identify items to remove by the item's ns, which is the namespace associated with a part, or prop.",
-            "$ref" : "#/definitions/TokenDatatype" } },
+            "$ref" : "#/definitions/TokenDatatype" },
+          "remarks" : 
+          { "$ref" : "#field_oscal-metadata_remarks" } },
         "additionalProperties" : false },
       "oscal-profile-oscal-profile:add" : 
       { "title" : "Addition",
@@ -389,7 +391,9 @@
           { "type" : "array",
             "minItems" : 1,
             "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } } },
+            { "$ref" : "#assembly_oscal-catalog-common_part" } },
+          "remarks" : 
+          { "$ref" : "#field_oscal-metadata_remarks" } },
         "additionalProperties" : false },
       "oscal-profile-oscal-metadata:metadata" : 
       { "title" : "Publication metadata",

diff --git a/xml/convert/oscal_complete_json-to-xml-converter.xsl b/xml/convert/oscal_complete_json-to-xml-converter.xsl
@@ -540,12 +540,13 @@
    <xsl:template match="j:array[@key='removes']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remove" -->
-      <assembly as-type="empty" name="remove" gi="remove">
+      <assembly name="remove" gi="remove">
          <xsl:apply-templates select="*[@key='by-name']"/>
          <xsl:apply-templates select="*[@key='by-class']"/>
          <xsl:apply-templates select="*[@key='by-id']"/>
          <xsl:apply-templates select="*[@key='by-item-name']"/>
          <xsl:apply-templates select="*[@key='by-ns']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
    <xsl:template match="j:array[@key='adds']/j:map">
@@ -559,6 +560,7 @@
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='parts']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']">

diff --git a/xml/convert/oscal_profile_json-to-xml-converter.xsl b/xml/convert/oscal_profile_json-to-xml-converter.xsl
@@ -351,12 +351,13 @@
    <xsl:template match="j:array[@key='removes']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remove" -->
-      <assembly as-type="empty" name="remove" gi="remove">
+      <assembly name="remove" gi="remove">
          <xsl:apply-templates select="*[@key='by-name']"/>
          <xsl:apply-templates select="*[@key='by-class']"/>
          <xsl:apply-templates select="*[@key='by-id']"/>
          <xsl:apply-templates select="*[@key='by-item-name']"/>
          <xsl:apply-templates select="*[@key='by-ns']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
    <xsl:template match="j:array[@key='adds']/j:map">
@@ -370,6 +371,7 @@
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='parts']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='back-matter']">

diff --git a/xml/schema/oscal_complete_schema.xsd b/xml/schema/oscal_complete_schema.xsd
@@ -2453,6 +2453,21 @@
          <xs:documentation>
             <b>Removal</b>: Specifies objects to be removed from a control based on specific aspects of the object that must all match.</xs:documentation>
       </xs:annotation>
+      <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="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
       <xs:attribute name="by-name" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
@@ -2546,6 +2561,19 @@
                      type="oscal-catalog-common-part-ASSEMBLY"
                      minOccurs="0"
                      maxOccurs="unbounded"/>
+         <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="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
       </xs:sequence>
       <xs:attribute name="position" type="TokenDatatype">
          <xs:annotation>

diff --git a/xml/schema/oscal_profile_schema.xsd b/xml/schema/oscal_profile_schema.xsd
@@ -500,6 +500,21 @@
          <xs:documentation>
             <b>Removal</b>: Specifies objects to be removed from a control based on specific aspects of the object that must all match.</xs:documentation>
       </xs:annotation>
+      <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="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
       <xs:attribute name="by-name" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
@@ -593,6 +608,19 @@
                      type="oscal-catalog-common-part-ASSEMBLY"
                      minOccurs="0"
                      maxOccurs="unbounded"/>
+         <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="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
       </xs:sequence>
       <xs:attribute name="position" type="TokenDatatype">
          <xs:annotation>