From d089dde1b4df95b51014e122fa0916291b433c05 Mon Sep 17 00:00:00 2001
From: Dave Waltermire <david.waltermire@gsa.gov>
Date: Mon, 22 Jul 2024 12:47:43 -0400
Subject: [PATCH] Added support for namespace bindings in modules and external
 constraints.

---
 .../metaschema-module-metaschema.xml          | 11 ++++++++---
 schema/xml/metaschema-meta-constraints.xsd    |  1 +
 schema/xml/metaschema.xsd                     | 19 +++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/schema/metaschema/metaschema-module-metaschema.xml b/schema/metaschema/metaschema-module-metaschema.xml
index 0b9c143d..b80b818d 100644
--- a/schema/metaschema/metaschema-module-metaschema.xml
+++ b/schema/metaschema/metaschema-module-metaschema.xml
@@ -53,7 +53,7 @@
                 </define-flag>
             </define-assembly>
             <assembly ref="metapath-namespace" max-occurs="unbounded">
-                <group-as name="namespaces" />
+                <group-as name="namespace-bindings" />
             </assembly>
             <choice-group max-occurs="unbounded">
                 <group-as name="definitions" in-json="ARRAY"/>
@@ -189,7 +189,7 @@
     <define-assembly name="metapath-namespace">
         <formal-name>Metapath Namespace Declaration</formal-name>
         <description>Assigns a Metapath namespace to a prefix for use in a Metapath expression in a lexical qualified name.</description>
-        <use-name>namespace</use-name>
+        <use-name>namespace-binding</use-name>
         <define-flag name="uri" as-type="uri" required="yes">
             <formal-name>Metapath Namespace URI</formal-name>
             <description>The namespace URI to bind to the prefix.</description>
@@ -1256,6 +1256,11 @@
                     <description>A relative or absolute URI for retrieving an out-of-line Metaschema constraint definition.</description>
                 </define-flag>
             </define-assembly>
+            
+            <assembly ref="metapath-namespace" max-occurs="unbounded">
+                <group-as name="namespace-bindings" />
+            </assembly>
+            
             <define-assembly name="scope" min-occurs="1" max-occurs="unbounded">
                 <group-as name="scopes" in-json="ARRAY"/>
                 <define-flag name="metaschema-namespace" as-type="uri" required="yes"/>
@@ -1321,7 +1326,7 @@
         <root-name>metaschema-meta-constraints</root-name>
         <model>
             <assembly ref="metapath-namespace" max-occurs="unbounded">
-                <group-as name="namespaces" />
+                <group-as name="namespace-bindings" />
             </assembly>
 
             <define-assembly name="definition-context">
diff --git a/schema/xml/metaschema-meta-constraints.xsd b/schema/xml/metaschema-meta-constraints.xsd
index 287eb2e1..ea0b74d5 100644
--- a/schema/xml/metaschema-meta-constraints.xsd
+++ b/schema/xml/metaschema-meta-constraints.xsd
@@ -11,6 +11,7 @@
     <xs:element name="metaschema-meta-constraints">
         <xs:complexType>
             <xs:sequence>
+                <xs:element name="namespace-binding" type="NamespaceBindingType" minOccurs="0" maxOccurs="unbounded"/> 
                 <xs:element name="context" type="ModelContextType" maxOccurs="unbounded"/>
             </xs:sequence>
         </xs:complexType>
diff --git a/schema/xml/metaschema.xsd b/schema/xml/metaschema.xsd
index d12822a4..fa16238b 100644
--- a/schema/xml/metaschema.xsd
+++ b/schema/xml/metaschema.xsd
@@ -45,6 +45,8 @@
 
         <xs:element name="import" type="MetaschemaImportType" minOccurs="0" maxOccurs="unbounded"/>
 
+		<xs:element name="namespace-binding" type="NamespaceBindingType" minOccurs="0" maxOccurs="unbounded"/> 
+
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="define-assembly" type="GlobalAssemblyDefinitionType"/>
           <xs:element name="define-field" type="GlobalFieldDefinitionType"/>
@@ -80,6 +82,22 @@
     </xs:attribute>
   </xs:complexType>
 
+  <xs:complexType name="NamespaceBindingType">
+  	<xs:annotation>
+      <xs:documentation>Assigns a Metapath namespace to a prefix for use in a Metapath expression in a lexical qualified name.</xs:documentation>
+  	</xs:annotation>
+	<xs:attribute name="prefix" type="TokenDatatype" use="required">
+      <xs:annotation>
+        <xs:documentation>The prefix that is bound to the namespace.</xs:documentation>
+      </xs:annotation>
+	</xs:attribute>
+	<xs:attribute name="uri" type="URIDatatype" use="required">
+      <xs:annotation>
+        <xs:documentation>The namespace URI to bind to the prefix.</xs:documentation>
+      </xs:annotation>
+	</xs:attribute>
+  </xs:complexType>
+
   <xs:group name="DefinitionMetadataGroup">
     <xs:sequence>
       <xs:element name="formal-name" minOccurs="0">
@@ -1303,6 +1321,7 @@
             </xs:attribute>
           </xs:complexType>
         </xs:element>
+        <xs:element name="namespace-binding" type="NamespaceBindingType" minOccurs="0" maxOccurs="unbounded"/> 
         <xs:element name="scope" maxOccurs="unbounded">
           <xs:complexType>
             <xs:choice maxOccurs="unbounded">