Rationalise schema files referred to by fragment files to all be pres…

…ent - and only present - in the xml directory.

Change references in all schema files.  Delete duplicate schema files in entities directory.

build.xml

@@ -1146,6 +1146,32 @@
 	</target>
 	-->
 
+	<!--
+	    Utility to apply a one-off change to every fragment file.
+	    
+	    The perl script is applied in "-i" mode to perform in-place
+	    editing; this only works well on Unix-like systems.
+	    
+	    Comment this out when not in use to avoid accidents.
+	-->
+	<!--
+	<target name="fix.fragments">
+        <for param="file">
+            <path>
+                <fileset dir="${entities.dir}" includes="uk*.xml"/>
+            </path>
+            <sequential>
+            	<echo>processing @{file}</echo>
+                <exec executable="perl" dir="${entities.dir}">
+                    <arg value="-i"/>
+                    <arg value="${build.dir}/fix_fragment.pl"/>
+                    <arg value="@{file}"/>
+                </exec>
+            </sequential>
+        </for>
+    </target>
+    -->
+
 	<!--
 		Extract embedded certificates
 	-->

build/fix_fragment.pl

@@ -0,0 +1,20 @@
+#!/usr/bin/perl -w
+
+#
+# Apply a given one-off change to the input fragment file.
+#
+
+while (<>) {
+
+	s {(\s)(?=shibboleth-metadata-1\.0\.xsd)}        {$1..\/xml\/};
+	s {(\s)(?=sstc-saml-schema-assertion-2\.0\.xsd)} {$1..\/xml\/};
+	s {(\s)(?=sstc-saml-schema-metadata-2\.0\.xsd)}  {$1..\/xml\/};
+	s {(\s)(?=uk-fed-label\.xsd)}                    {$1..\/xml\/};
+	s {(\s)(?=xenc-schema\.xsd)}                     {$1..\/xml\/};
+	s {(\s)(?=xml\.xsd)}                             {$1..\/xml\/};
+	s {(\s)(?=xmldsig-core-schema\.xsd)}             {$1..\/xml\/};
+
+	print $_;
+}
+
+# end