From bb4f6396d6b2c15bec2a4e7255c34bd5f6925cf3 Mon Sep 17 00:00:00 2001
From: David Waltermire <david.waltermire@nist.gov>
Date: Wed, 14 Feb 2024 11:06:17 -0500
Subject: [PATCH] Aligned Metaschema module with XSD.

---
 schema/metaschema/metaschema-module-metaschema.xml | 11 +++++++++--
 schema/xml/metaschema-meta-constraints.xsd         |  3 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/schema/metaschema/metaschema-module-metaschema.xml b/schema/metaschema/metaschema-module-metaschema.xml
index f76aa795..e4140171 100644
--- a/schema/metaschema/metaschema-module-metaschema.xml
+++ b/schema/metaschema/metaschema-module-metaschema.xml
@@ -1311,11 +1311,18 @@
         </model>            
     </define-assembly>
 
+	<define-assembly name="metaschema-metapath">
+	    <description>A Metapath expression identifying the model node that the constraints will be applied to.</description>
+	    <use-name>metapath</use-name>
+	    <define-flag name="target" required="yes"/>
+	</define-assembly>
+
     <define-assembly name="metapath-context">
         <model>
-            <define-field name="metapath" as-type="string">
+            <assembly ref="metaschema-metapath" min-occurs="1" max-occurs="unbounded">
                 <description>A Metapath expression identifying the model node that the constraints will be applied to.</description>
-            </define-field>
+                <group-as name="metapaths" in-json="ARRAY"/>
+            </assembly>
             <assembly ref="assembly-constraints">
                 <use-name>constraints</use-name>
             </assembly>
diff --git a/schema/xml/metaschema-meta-constraints.xsd b/schema/xml/metaschema-meta-constraints.xsd
index a601faeb..7a476a4a 100644
--- a/schema/xml/metaschema-meta-constraints.xsd
+++ b/schema/xml/metaschema-meta-constraints.xsd
@@ -31,8 +31,7 @@
             <!--
             <xs:choice>
             -->
-            <xs:element name="metaschema-metapath" type="MetaschemaMetapathReferenceType"
-                maxOccurs="unbounded"/>
+            <xs:element name="metapath" type="MetaschemaMetapathReferenceType" maxOccurs="unbounded"/>
             <!--
                 <xs:element name="metaschema-definition" type="MetaschemaMetapathReferenceType" maxOccurs="unbounded"/>
             </xs:choice>