From eae19ab94dfc8d1557c849a069995fa3bfe4b762 Mon Sep 17 00:00:00 2001
From: Dave Waltermire <david.waltermire@gsa.gov>
Date: Thu, 20 Jun 2024 22:14:06 -0400
Subject: [PATCH] Corrected mismatched context name in the XSD vs module
 definition. Using XSD, since this is what has been used for validation.

---
 schema/metaschema/metaschema-module-constraints.xml | 4 ++--
 schema/metaschema/metaschema-module-metaschema.xml  | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/schema/metaschema/metaschema-module-constraints.xml b/schema/metaschema/metaschema-module-constraints.xml
index 668e7328..c91a1e34 100644
--- a/schema/metaschema/metaschema-module-constraints.xml
+++ b/schema/metaschema/metaschema-module-constraints.xml
@@ -5,7 +5,7 @@
     <context>
         <metapath target="/METASCHEMA"/>
         <constraints>
-            <let var="all-imports" expression="recurse-depth(.,'doc(resolve-uri(import/@href))/METASCHEMA'"/>
+            <let var="all-imports" expression="recurse-depth(.,'doc(resolve-uri(import/@href))/METASCHEMA')"/>
             <index id="metaschema-short-name-unique" target="(.|$all-imports)" name="metaschema-metadata-short-name-index">
                 <formal-name>Unique Module Short Names</formal-name>
                 <description>Ensures that the current and all imported modules have a unique short name.</description>
@@ -35,7 +35,7 @@
                     <description>Ensure each import has a resolvable @href.</description>
                     <message>Unable to access a Metaschema module at '{{ resolve-uri(@href) }}'.</message>
                 </expect>
-                <expect id="metaschema-import-href-is-module" target="." test="exists(doc(resolve-uri(import/@href))/METASCHEMA)">
+                <expect id="metaschema-import-href-is-module" target="." test="doc(resolve-uri(import/@href))/METASCHEMA ! exists(.)">
                     <formal-name>Import is Resolvable</formal-name>
                     <description>Ensure each import is a Metaschema module.</description>
                     <message>Unable the resource at '{{ resolve-uri(@href) }}' is not a Metaschema module.</message>
diff --git a/schema/metaschema/metaschema-module-metaschema.xml b/schema/metaschema/metaschema-module-metaschema.xml
index 45049c82..0cdd5915 100644
--- a/schema/metaschema/metaschema-module-metaschema.xml
+++ b/schema/metaschema/metaschema-module-metaschema.xml
@@ -1313,7 +1313,8 @@
                 </model>
             </define-assembly>
             <assembly ref="metapath-context" min-occurs="1" max-occurs="unbounded">
-                <group-as name="metapath-contexts" in-json="ARRAY"/>
+		    	<use-name>context</use-name>
+                <group-as name="contexts" in-json="ARRAY"/>
             </assembly>
         </model>            
     </define-assembly>
@@ -1334,7 +1335,8 @@
                 <use-name>constraints</use-name>
             </assembly>
             <assembly ref="metapath-context" max-occurs="unbounded">
-                <group-as name="metapath-contexts" in-json="ARRAY"/>
+            	<use-name>context</use-name>
+                <group-as name="contexts" in-json="ARRAY"/>
             </assembly>
             <field ref="remarks"/>
         </model>