Deploying content [ci deploy skip]

usnistgov · Jun 16, 2019 · 49fa677 · 49fa677
1 parent 62e6670
commit 49fa677
Show file tree

Hide file tree

Showing 19 changed files with 24,588 additions and 23,927 deletions.
diff --git a/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_HIGH-baseline_profile-min.json b/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_HIGH-baseline_profile-min.json
diff --git a/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_HIGH-baseline_profile.json b/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_HIGH-baseline_profile.json
diff --git a/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_LOW-baseline_profile-min.json b/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_LOW-baseline_profile-min.json
diff --git a/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_LOW-baseline_profile.json b/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_LOW-baseline_profile.json
diff --git a/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_MODERATE-baseline_profile-min.json b/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_MODERATE-baseline_profile-min.json
diff --git a/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_MODERATE-baseline_profile.json b/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_MODERATE-baseline_profile.json
diff --git a/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_catalog-min.json b/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_catalog-min.json
diff --git a/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_catalog.json b/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_catalog.json
diff --git a/content/nist.gov/SP800-53/rev4/yaml/NIST_SP-800-53_rev4_HIGH-baseline_profile.yaml b/content/nist.gov/SP800-53/rev4/yaml/NIST_SP-800-53_rev4_HIGH-baseline_profile.yaml
diff --git a/content/nist.gov/SP800-53/rev4/yaml/NIST_SP-800-53_rev4_LOW-baseline_profile.yaml b/content/nist.gov/SP800-53/rev4/yaml/NIST_SP-800-53_rev4_LOW-baseline_profile.yaml
diff --git a/content/nist.gov/SP800-53/rev4/yaml/NIST_SP-800-53_rev4_MODERATE-baseline_profile.yaml b/content/nist.gov/SP800-53/rev4/yaml/NIST_SP-800-53_rev4_MODERATE-baseline_profile.yaml
diff --git a/content/nist.gov/SP800-53/rev4/yaml/NIST_SP-800-53_rev4_catalog.yaml b/content/nist.gov/SP800-53/rev4/yaml/NIST_SP-800-53_rev4_catalog.yaml
diff --git a/json/convert/oscal_catalog_xml-to-json-converter.xsl b/json/convert/oscal_catalog_xml-to-json-converter.xsl
@@ -285,7 +285,9 @@
       </map>
    </xsl:template>
    <xsl:template match="prop" mode="xml2json">
-      <xsl:variable name="text-key">STRVALUE</xsl:variable>
+      <xsl:variable name="text-key">
+         <xsl:value-of select="@name"/>
+      </xsl:variable>
       <map key="prop">
          <xsl:apply-templates mode="as-string" select="@name"/>
          <xsl:apply-templates mode="as-string" select="@id"/>

diff --git a/json/convert/oscal_profile_xml-to-json-converter.xsl b/json/convert/oscal_profile_xml-to-json-converter.xsl
@@ -285,7 +285,9 @@
       </map>
    </xsl:template>
    <xsl:template match="prop" mode="xml2json">
-      <xsl:variable name="text-key">STRVALUE</xsl:variable>
+      <xsl:variable name="text-key">
+         <xsl:value-of select="@name"/>
+      </xsl:variable>
       <map key="prop">
          <xsl:apply-templates mode="as-string" select="@name"/>
          <xsl:apply-templates mode="as-string" select="@id"/>

diff --git a/json/convert/oscal_ssp_xml-to-json-converter.xsl b/json/convert/oscal_ssp_xml-to-json-converter.xsl
@@ -274,7 +274,9 @@
       </map>
    </xsl:template>
    <xsl:template match="prop" mode="xml2json">
-      <xsl:variable name="text-key">STRVALUE</xsl:variable>
+      <xsl:variable name="text-key">
+         <xsl:value-of select="@name"/>
+      </xsl:variable>
       <map key="prop">
          <xsl:apply-templates mode="as-string" select="@name"/>
          <xsl:apply-templates mode="as-string" select="@id"/>

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_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_profile_schema.xsd b/xml/schema/oscal_profile_schema.xsd
@@ -892,7 +892,12 @@
             <xs:element maxOccurs="unbounded" minOccurs="0" ref="oscal-profile:link"/>
             <xs:element maxOccurs="unbounded" minOccurs="0" ref="oscal-profile:part"/>
          </xs:sequence>
-         <xs:attribute name="param-id" type="xs:NCName" use="required"/>
+         <xs:attribute name="param-id" type="xs:NCName" use="required">
+            <xs:annotation>
+               <xs:documentation>
+                  <b>Parameter ID: </b>Value of the 'id' flag on a target parameter</xs:documentation>
+            </xs:annotation>
+         </xs:attribute>
          <xs:attribute name="class" type="xs:NMTOKENS">
             <xs:annotation>
                <xs:documentation>