Publishing generated metaschema resources [ci skip]

aj-stein-nist · Jan 10, 2023 · 2da4e5f · 2da4e5f
1 parent cf3f589
commit 2da4e5f
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/json/convert/oscal_catalog_xml-to-json-converter.xsl b/json/convert/oscal_catalog_xml-to-json-converter.xsl
@@ -2409,7 +2409,7 @@
             <xsl:attribute name="key">relationship</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="@ns"/>
-         <value as-type="token" key="STRVALUE" in-json="string">
+         <value as-type="token" key="type" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
@@ -2904,7 +2904,7 @@
             <xsl:attribute name="key">relationship</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="@ns"/>
-         <value as-type="token" key="STRVALUE" in-json="string">
+         <value as-type="token" key="type" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>

diff --git a/json/convert/oscal_complete_xml-to-json-converter.xsl b/json/convert/oscal_complete_xml-to-json-converter.xsl
@@ -6040,7 +6040,7 @@
             <xsl:attribute name="key">relationship</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="@ns"/>
-         <value as-type="token" key="STRVALUE" in-json="string">
+         <value as-type="token" key="type" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
@@ -6535,7 +6535,7 @@
             <xsl:attribute name="key">relationship</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="@ns"/>
-         <value as-type="token" key="STRVALUE" in-json="string">
+         <value as-type="token" key="type" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
@@ -7594,7 +7594,7 @@
             <xsl:attribute name="key">relationship</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="@ns"/>
-         <value as-type="token" key="STRVALUE" in-json="string">
+         <value as-type="token" key="type" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>

diff --git a/json/convert/oscal_mapping_xml-to-json-converter.xsl b/json/convert/oscal_mapping_xml-to-json-converter.xsl
@@ -1758,7 +1758,7 @@
             <xsl:attribute name="key">relationship</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="@ns"/>
-         <value as-type="token" key="STRVALUE" in-json="string">
+         <value as-type="token" key="type" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>

diff --git a/json/schema/oscal_catalog_schema.json b/json/schema/oscal_catalog_schema.json
@@ -998,10 +998,10 @@
               { "title" : "Relationship Value Namespace",
                 "description" : "A namespace qualifying the relationship's value. This allows different organizations to associate distinct semantics for relationships with the same name.",
                 "$ref" : "#/definitions/URIDatatype" },
-              "STRVALUE" : 
+              "type" : 
               { "type" : "string" } },
             "required" : 
-            [ "STRVALUE" ],
+            [ "type" ],
             "additionalProperties" : false,
             "enum" : 
             [ "equivalent-to",

diff --git a/json/schema/oscal_complete_schema.json b/json/schema/oscal_complete_schema.json
@@ -998,10 +998,10 @@
               { "title" : "Relationship Value Namespace",
                 "description" : "A namespace qualifying the relationship's value. This allows different organizations to associate distinct semantics for relationships with the same name.",
                 "$ref" : "#/definitions/URIDatatype" },
-              "STRVALUE" : 
+              "type" : 
               { "type" : "string" } },
             "required" : 
-            [ "STRVALUE" ],
+            [ "type" ],
             "additionalProperties" : false,
             "enum" : 
             [ "equivalent-to",

diff --git a/json/schema/oscal_mapping_schema.json b/json/schema/oscal_mapping_schema.json
@@ -717,10 +717,10 @@
               { "title" : "Relationship Value Namespace",
                 "description" : "A namespace qualifying the relationship's value. This allows different organizations to associate distinct semantics for relationships with the same name.",
                 "$ref" : "#/definitions/URIDatatype" },
-              "STRVALUE" : 
+              "type" : 
               { "type" : "string" } },
             "required" : 
-            [ "STRVALUE" ],
+            [ "type" ],
             "additionalProperties" : false,
             "enum" : 
             [ "equivalent-to",

diff --git a/xml/convert/oscal_catalog_json-to-xml-converter.xsl b/xml/convert/oscal_catalog_json-to-xml-converter.xsl
@@ -2441,7 +2441,7 @@
    <!-- matching catalog//control/mapping/map/relationship-->
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']"
                  mode="get-value-property">
-      <value as-type="token" key="STRVALUE" in-json="string">
+      <value as-type="token" key="type" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
@@ -3139,7 +3139,7 @@
    <!-- matching catalog//group//control/mapping/map/relationship-->
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']"
                  mode="get-value-property">
-      <value as-type="token" key="STRVALUE" in-json="string">
+      <value as-type="token" key="type" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>

diff --git a/xml/convert/oscal_complete_json-to-xml-converter.xsl b/xml/convert/oscal_complete_json-to-xml-converter.xsl
@@ -5256,7 +5256,7 @@
    <!-- matching catalog//control/mapping/map/relationship-->
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']"
                  mode="get-value-property">
-      <value as-type="token" key="STRVALUE" in-json="string">
+      <value as-type="token" key="type" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
@@ -5954,7 +5954,7 @@
    <!-- matching catalog//group//control/mapping/map/relationship-->
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']"
                  mode="get-value-property">
-      <value as-type="token" key="STRVALUE" in-json="string">
+      <value as-type="token" key="type" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
@@ -7207,7 +7207,7 @@
    <!-- matching mapping-collection/mapping/map/relationship-->
    <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:map[@key='relationship']"
                  mode="get-value-property">
-      <value as-type="token" key="STRVALUE" in-json="string">
+      <value as-type="token" key="type" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>

diff --git a/xml/convert/oscal_mapping_json-to-xml-converter.xsl b/xml/convert/oscal_mapping_json-to-xml-converter.xsl
@@ -1791,7 +1791,7 @@
    <!-- matching mapping-collection/mapping/map/relationship-->
    <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:map[@key='relationship']"
                  mode="get-value-property">
-      <value as-type="token" key="STRVALUE" in-json="string">
+      <value as-type="token" key="type" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>