From ab9fc4d3160ec82963119a3385c4efa2799fbaff Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 5 Apr 2010 13:25:33 +0000
Subject: [PATCH] Stop generating and publishing the Shibboleth 1.2 format
 metadata.

---
 build.xml | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/build.xml b/build.xml
index 2e83af9a..8180a1d7 100644
--- a/build.xml
+++ b/build.xml
@@ -107,10 +107,6 @@
 		
 		[19]	ukfederation-metadata-unsigned.xml
 		[20]		ukfederation-metadata.xml
-		[21]		ukfederation-sites-12-unsigned.xml
-		[22]			ukfederation-sites-12.xml
-		[23]		ukfederation-trust-12-unsigned.xml
-		[24]			ukfederation-trust-12.xml
 		[25]		ukfederation-wayf-unsigned.xml
 		[26]			ukfederation-wayf.xml
 		
@@ -244,8 +240,6 @@
 				knownhosts="${known.hosts}">
 			<fileset dir="${xml.dir}">
 				<include name="${md.prod.signed}"/>
-				<include name="ukfederation-sites-12.xml"/>
-				<include name="ukfederation-trust-12.xml"/>
 				<include name="${md.wayf.signed}"/>
 				<include name="${md.test.signed}"/>
 				<include name="${md.back.signed}"/>
@@ -287,8 +281,6 @@
 	<target name="verify.remote.metadata">
 		<echo>Verifying metadata held at ${remote.url}</echo>
 		<VFY.remote i="${md.prod.signed}"/>
-		<VFY.remote i="ukfederation-sites-12.xml"/>
-		<VFY.remote i="ukfederation-trust-12.xml"/>
 		<VFY.remote i="${md.wayf.signed}"/>
 		<VFY.remote i="${md.test.signed}"/>
 		<VFY.remote i="${md.back.signed}"/>
@@ -335,7 +327,7 @@
 		Unsigned metadata generation for the UK Federation.
 	-->
 
-	<target name="gen.uk" depends="gen.uk.unsigned, gen.uk.1.2, gen.uk.wayf">
+	<target name="gen.uk" depends="gen.uk.unsigned, gen.uk.wayf">
 		<echo>Generated UK unsigned metadata.</echo>
 	</target>
 
@@ -363,16 +355,6 @@
 			o="${md.back.unsigned}" />
 	</target>
 	
-	<target name="gen.uk.1.2" depends="gen.uk.unsigned">
-		<echo>Generating unsigned UK V1.2 metadata.</echo>
-		<!-- [21] -->
-		<XALAN x="v13_to_v12_sites.xsl" i="${md.prod.unsigned}"
-			o="ukfederation-sites-12-unsigned.xml"/>
-		<!-- [23] -->
-		<XALAN x="v13_to_v12_trust.xsl" i="${md.prod.unsigned}"
-			o="ukfederation-trust-12-unsigned.xml"/>
-	</target>
-	
 	<target name="gen.uk.wayf" depends="gen.uk.unsigned">
 		<echo>Generating unsigned UK WAYF metadata.</echo>
 		<!-- [25] -->
@@ -636,14 +618,6 @@
 		<!-- [20] -->
 		<SIGN.uk i="${md.prod.unsigned}" o="${md.prod.signed}"/>
 
-		<echo>Signing UK V1.2 metadata.</echo>
-		<!-- [22] -->
-		<SIGN.uk i="ukfederation-sites-12-unsigned.xml"
-			o="ukfederation-sites-12.xml"/>
-		<!-- [24] -->
-		<SIGN.uk i="ukfederation-trust-12-unsigned.xml"
-			o="ukfederation-trust-12.xml"/>
-
 		<echo>Signing UK WAYF metadata.</echo>
 		<!-- [26] -->
 		<SIGN.uk i="${md.wayf.unsigned}" o="${md.wayf.signed}"/>
@@ -689,10 +663,6 @@
 		<echo>Verifying signed UK metadata.</echo>
 		<VFY.uk i="${md.prod.signed}"/>
 
-		<echo>Verifying signed UK V1.2 metadata.</echo>
-		<VFY.uk i="ukfederation-sites-12.xml"/>
-		<VFY.uk i="ukfederation-trust-12.xml"/>
-
 		<echo>Verifying signed UK WAYF metadata.</echo>
 		<VFY.uk i="${md.wayf.signed}"/>