From 087bdef375f95c24fdd65755529cf443fbc013a0 Mon Sep 17 00:00:00 2001
From: Wendell Piez <wendell.piez@nist.gov>
Date: Mon, 10 Jun 2019 16:58:38 -0400
Subject: [PATCH] Completed work reflecting schema version in XSD and JSON
 schema (#57)

---
 build/metaschema/json/json-schema-metamap.xsl | 2 +-
 build/metaschema/lib/metaschema-check.sch     | 2 +-
 build/metaschema/lib/metaschema.xsd           | 4 ++++
 build/metaschema/xml/produce-xsd.xsl          | 4 +++-
 src/metaschema/oscal_catalog_metaschema.xml   | 1 +
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/build/metaschema/json/json-schema-metamap.xsl b/build/metaschema/json/json-schema-metamap.xsl
index 38f2154dfe..2eb712eb9c 100644
--- a/build/metaschema/json/json-schema-metamap.xsl
+++ b/build/metaschema/json/json-schema-metamap.xsl
@@ -33,7 +33,7 @@
     <xsl:template match="/METASCHEMA" expand-text="true">
         <map>
             <string key="$schema">http://json-schema.org/draft-07/schema#</string>
-            <string key="$id">http://csrc.nist.gov/ns/oscal/1.0/{ short-name }-schema.json</string>
+            <string key="$id">http://csrc.nist.gov/ns/oscal/{ $composed-metaschema/METASCHEMA/schema-version }/{ short-name }-schema.json</string>
             <xsl:for-each select="schema-name">
               <string key="$comment">{ . }: JSON Schema</string>
             </xsl:for-each>
diff --git a/build/metaschema/lib/metaschema-check.sch b/build/metaschema/lib/metaschema-check.sch
index 7a928c3820..0d3ff211b7 100644
--- a/build/metaschema/lib/metaschema-check.sch
+++ b/build/metaschema/lib/metaschema-check.sch
@@ -114,6 +114,7 @@
     <sch:pattern>
         <sch:rule context="/m:METASCHEMA">
             <sch:assert test="@root=*/@name">METASCHEMA/@root should be one of <sch:value-of select="string-join(*/@name,', ')"/></sch:assert>
+            <sch:assert test="exists(m:schema-version)" role="warning">Metaschema schema version must be set for any top-level metaschema</sch:assert>
         </sch:rule>
         <sch:rule context="/m:METASCHEMA/m:title"/>
         <sch:rule context="/m:METASCHEMA/m:import">
@@ -122,7 +123,6 @@
             <!--<sch:report test="empty($imported-schemas/m:METASCHEMA)">Don't see imported schemas</sch:report>-->
         </sch:rule>
        
-        <sch:rule context="/m:METASCHEMA/*[matches(@acquire-from,'\S')]"/>
         <sch:rule context="m:define-assembly">
             <sch:assert role="warning" test="@name = ($composed-metaschema//m:assembly/@named | $composed-metaschema//m:assemblies/@named | /m:METASCHEMA/@root)">Definition for assembly '<sch:value-of select="@name"/>' is not used.</sch:assert>
         </sch:rule>
diff --git a/build/metaschema/lib/metaschema.xsd b/build/metaschema/lib/metaschema.xsd
index 87ea44c7b7..d1a430fb63 100644
--- a/build/metaschema/lib/metaschema.xsd
+++ b/build/metaschema/lib/metaschema.xsd
@@ -12,6 +12,7 @@
       
       <xs:sequence>
         <xs:element ref="m:schema-name"/>
+        <xs:element ref="m:schema-version" minOccurs="0"/>
         <xs:element ref="m:short-name"/>
         <xs:element ref="m:namespace" minOccurs="1"/>
         <xs:element ref="m:remarks" minOccurs="0"/>
@@ -134,6 +135,9 @@
       </xs:choice>
     </xs:complexType>
   </xs:element>
+  <xs:element name="schema-version">
+    <xs:complexType mixed="true"/>
+  </xs:element>
   <xs:element name="short-name">
     <xs:complexType mixed="true">
       <xs:choice maxOccurs="unbounded">
diff --git a/build/metaschema/xml/produce-xsd.xsl b/build/metaschema/xml/produce-xsd.xsl
index ebcd78e0cf..38aa5c7e1b 100644
--- a/build/metaschema/xml/produce-xsd.xsl
+++ b/build/metaschema/xml/produce-xsd.xsl
@@ -51,7 +51,9 @@
     
     <xsl:template match="/METASCHEMA">
         <xs:schema elementFormDefault="qualified" targetNamespace="{ $target-namespace }">
-
+            <xsl:for-each select="$composed-metaschema/METASCHEMA/schema-version">
+                <xsl:attribute name="version" select="normalize-space(.)"/>
+            </xsl:for-each>
             <xsl:apply-templates select="$composed-metaschema/METASCHEMA/*"/>
             <!--<xsl:apply-templates select="*"/>-->
             
diff --git a/src/metaschema/oscal_catalog_metaschema.xml b/src/metaschema/oscal_catalog_metaschema.xml
index 25e1bcd4ec..d0974c5309 100644
--- a/src/metaschema/oscal_catalog_metaschema.xml
+++ b/src/metaschema/oscal_catalog_metaschema.xml
@@ -10,6 +10,7 @@
  root="catalog">
 
   <schema-name>OSCAL Control Catalog Format</schema-name>
+  <schema-version>1.0-M1</schema-version>
   <short-name>oscal-catalog</short-name>
   <namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>