From ab83c25e91a6dd686981720e93ed1b3a47312083 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 25 Jul 2011 13:37:31 +0000
Subject: [PATCH] Migrate the extract.locs to using the new flow.uk.collect
 system rather than the file that came out by accident in the old system.

---
 build.xml             | 2 +-
 build/extract_locs.pl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 5ed6a066..ba3728bc 100644
--- a/build.xml
+++ b/build.xml
@@ -1241,7 +1241,7 @@
 	<!--
 		Extract TLS locations from the UK federation metadata.
 	-->
-	<target name="extract.locs" depends="gen.uk.unsigned">
+	<target name="extract.locs" depends="flow.uk.collect">
 		<echo>Extracting TLS locations</echo>
 		<exec executable="perl" dir="${build.dir}"
 			output="${build.dir}/locations.txt">
diff --git a/build/extract_locs.pl b/build/extract_locs.pl
index 338a291c..a516194d 100755
--- a/build/extract_locs.pl
+++ b/build/extract_locs.pl
@@ -2,7 +2,7 @@
 
 use Xalan;
 
-open(XML, xalanCall . " -IN ../xml/ukfederation-metadata-unsigned.xml -XSL extract_locs.xsl|") || die "could not open input file";
+open(XML, xalanCall . " -IN ../mdx/uk/collected.xml -XSL extract_locs.xsl|") || die "could not open input file";
 while (<XML>) {
 	chop;
 	if (/^https:\/\/([^\/:]+(:\d+)?)(\/|$)/) {