From 60393a7f3e8ba3dea2e769cb8110fd2ca08cefa5 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 24 Oct 2017 12:24:35 +0100
Subject: [PATCH] Strip schemaLocations from MDQ test output

See ukf/ukf-meta#127.
---
 mdx/common-beans.xml     | 8 ++++++++
 mdx/uk/mdq-multisign.xml | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 0d8ff471..1bd29473 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -259,6 +259,14 @@
     <bean id="stripUkfedlabelNamespace" parent="mda.NamespaceStrippingStage"
         p:namespace-ref="ukfedlabel_namespace"/>
 
+    <!--
+        stripXsiNamespace
+
+        Strip the XML Schema Instance namespace.
+    -->
+    <bean id="stripXsiNamespace" parent="mda.NamespaceStrippingStage"
+        p:namespace-ref="xsi_namespace"/>
+
     <!--
         normaliseNamespaces
 
diff --git a/mdx/uk/mdq-multisign.xml b/mdx/uk/mdq-multisign.xml
index f834e62a..bdd11292 100644
--- a/mdx/uk/mdq-multisign.xml
+++ b/mdx/uk/mdq-multisign.xml
@@ -54,6 +54,15 @@
                 <!-- Remove UKFederationLabel elements. -->
                 <ref bean="uk_strip_UKFederationMember"/>
 
+                <!--
+                    Remove xsi elements and attributes.
+
+                    In practice, this just cleans up the results we get in
+                    a development environment, as the normal UKf aggregate
+                    already excludes this namespace.
+                -->
+                <ref bean="stripXsiNamespace"/>
+
                 <!-- Break down into individual entities. -->
                 <ref bean="disassemble"/>