From fc1631d1bf5e17412b351813e3d06cbe0ab13c16 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Sat, 8 Jul 2006 08:19:28 +0000
Subject: [PATCH] Stop generating metadata for Shibboleth 1.1

---
 build.xml                  | 35 +++-------------
 build/v12_to_v11.xsl       | 65 -----------------------------
 build/v12_to_v11_trust.xsl | 84 --------------------------------------
 3 files changed, 5 insertions(+), 179 deletions(-)
 delete mode 100644 build/v12_to_v11.xsl
 delete mode 100644 build/v12_to_v11_trust.xsl

diff --git a/build.xml b/build.xml
index f2d35b5c..fc6c87f6 100644
--- a/build.xml
+++ b/build.xml
@@ -22,20 +22,17 @@
 	[6]				== sdss-sites-unsigned
 	[7]				sdss-sites-12
 	[8]					== sdss-sites
-	[9]				sdss-sites-11-unsigned
-	[10]				sdss-sites-11
 	[11]		sdss-trust-12-unsigned
 	[12]			== sdss-trust-unsigned
 	[13]			sdss-trust-12
 	[14]				== sdss-trust
-	[15]			sdss-trust-11-unsigned
-	[16]				sdss-trust-11
 	[17]		sdss-wayf-unsigned.xml
 	[18]			sdss-wayf.xml
  
 	In the above list, indentation implies the creation hierarchy and "=="
 	implies creation by copying.  The numbers in brackets are duplicated
-	in the script where the file in question is created.
+	in the script where the file in question is created.  Some numbers are
+	missing because some old format files are no longer being generated.
 -->
 <project default="process">
     
@@ -98,7 +95,7 @@
 	<!--
 		Generate unsigned metadata.
 	-->
-	<target name="generate" depends="gen.shibb.1.3, gen.shibb.1.2, gen.shibb.1.1, gen.wayf">
+	<target name="generate" depends="gen.shibb.1.3, gen.shibb.1.2, gen.wayf">
 		<echo>Generated unsigned metadata.</echo>
 	</target>
 
@@ -146,14 +143,6 @@
 			tofile="${xml.dir}/sdss-trust-unsigned.xml"/>
 	</target>
 	
-	<target name="gen.shibb.1.1" depends="gen.shibb.1.2">
-		<echo>Generating unsigned V1.1 metadata.</echo>
-		<!-- [9] -->
-		<XALAN x="v12_to_v11.xsl" i="sdss-sites-12-unsigned.xml" o="sdss-sites-11-unsigned.xml"/>
-		<!-- [15] -->
-		<XALAN x="v12_to_v11_trust.xsl" i="sdss-trust-12-unsigned.xml" o="sdss-trust-11-unsigned.xml"/>
-	</target>
-	
 	<target name="gen.wayf">
 		<echo>Generating unsigned WAYF metadata.</echo>
 		<!-- [17] -->
@@ -227,7 +216,7 @@
 	<!--
 		Sign the various metadata files.
 	-->
-	<target name="sign" depends="sign.shibb.1.3, sign.shibb.1.2, sign.shibb.1.1, sign.wayf">
+	<target name="sign" depends="sign.shibb.1.3, sign.shibb.1.2, sign.wayf">
 		<echo>Generated signed metadata.</echo>
 	</target>
 	
@@ -254,14 +243,6 @@
 			tofile="${xml.dir}/sdss-trust.xml"/>
 	</target>
 
-	<target name="sign.shibb.1.1">
-		<echo>Signing Shibboleth 1.1 metadata.</echo>
-		<!-- [10] -->
-		<SIGN i="sdss-sites-11-unsigned.xml" o="sdss-sites-11.xml"/>
-		<!-- [16] -->
-		<SIGN i="sdss-trust-11-unsigned.xml" o="sdss-trust-11.xml"/>
-	</target>
-	
 	<target name="sign.wayf">
 		<echo>Signing WAYF metadata.</echo>
 		<!-- [18] -->
@@ -271,7 +252,7 @@
 	<!--
 		Verify the signed metadata files.
 	-->
-	<target name="verify" depends="verify.shibb.1.3, verify.shibb.1.2, verify.shibb.1.1, verify.wayf">
+	<target name="verify" depends="verify.shibb.1.3, verify.shibb.1.2, verify.wayf">
 		<echo>Verified signed metadata.</echo>
 	</target>
 
@@ -289,12 +270,6 @@
 		<VFY i="sdss-trust.xml"/>
 	</target>
 	
-	<target name="verify.shibb.1.1">
-		<echo>Verifying signed Shibboleth 1.1 metadata.</echo>
-		<VFY i="sdss-sites-11.xml"/>
-		<VFY i="sdss-trust-11.xml"/>
-	</target>
-	
 	<target name="verify.wayf">
 		<echo>Verifying signed WAYF metadata.</echo>
 		<VFY i="sdss-wayf.xml"/>
diff --git a/build/v12_to_v11.xsl b/build/v12_to_v11.xsl
deleted file mode 100644
index 3b43fa38..00000000
--- a/build/v12_to_v11.xsl
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	v12_to_v11.xsl
-	
-	XSL stylesheet converting a Shibboleth 1.2 sites metadata file into the equivalent for
-	Shibboleth 1.1.
-
-	Author: Ian A. Young <ian@iay.org.uk>
-
-	$Id: v12_to_v11.xsl,v 1.5 2005/04/28 12:46:53 iay Exp $
--->
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:shibb10="urn:mace:shibboleth:1.0"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	exclude-result-prefixes="shibb10">
-	
-	<!--
-		Version information for this file.  Remember to peel off the dollar signs
-		before dropping the text into another versioned file.
-	-->
-	<xsl:param name="cvsId">$Id: v12_to_v11.xsl,v 1.5 2005/04/28 12:46:53 iay Exp $</xsl:param>
-
-	<!--
-		Add a comment to the start of the output file.
-	-->
-	<xsl:template match="/">
-		<xsl:comment>
-			<xsl:text>&#10;&#9;***DO NOT EDIT THIS FILE***&#10;&#10;</xsl:text>
-			<xsl:text>&#9;Converted by:&#10;&#10;&#9;</xsl:text>
-			<xsl:value-of select="substring-before(substring-after($cvsId, ': '), '$')"/>
-			<xsl:text>&#10;</xsl:text>
-		</xsl:comment>
-		<xsl:apply-templates/>
-	</xsl:template>
-
-	<!--Force UTF-8 encoding for the output.-->
-	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
-
-	<!--
-		shibb10:SiteGroup is the root element for the sites file.  Process it by copying across everything except DestinationSite elements.
-	-->
-	<xsl:template match="shibb10:SiteGroup">
-		<xsl:copy>
-			<xsl:attribute name="xsi:schemaLocation">
-				<xsl:text>urn:mace:shibboleth:1.0 shibboleth.xsd</xsl:text>
-			</xsl:attribute>
-			<xsl:apply-templates select="@Name|text()|comment()|shibb10:OriginSite"/>
-		</xsl:copy>
-	</xsl:template>
-
-	<!--By default, copy text blocks, comments and attributes unchanged.-->
-	<xsl:template match="text()|comment()|@*">
-		<xsl:copy/>
-	</xsl:template>
-
-	<!--By default, copy all elements from the input to the output, along with their attributes and contents.-->
-	<xsl:template match="*">
-		<xsl:copy>
-			<xsl:apply-templates select="node()|@*"/>
-		</xsl:copy>
-	</xsl:template>
-
-</xsl:stylesheet>
diff --git a/build/v12_to_v11_trust.xsl b/build/v12_to_v11_trust.xsl
deleted file mode 100644
index 404dc82b..00000000
--- a/build/v12_to_v11_trust.xsl
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	v12_to_v11_trust.xsl
-	
-	XSL stylesheet converting a Shibboleth 1.2 trust metadata file into the equivalent for
-	Shibboleth 1.1.
-
-	Author: Ian A. Young <ian@iay.org.uk>
-
-	$Id: v12_to_v11_trust.xsl,v 1.1 2005/04/12 10:21:35 iay Exp $
--->
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:shibb10="urn:mace:shibboleth:1.0"
-	xmlns:trust10="urn:mace:shibboleth:trust:1.0"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns="urn:mace:shibboleth:1.0"
-	exclude-result-prefixes="shibb10 trust10">
-	
-	<!--
-		Version information for this file.  Remember to peel off the dollar signs
-		before dropping the text into another versioned file.
-	-->
-	<xsl:param name="cvsId">$Id: v12_to_v11_trust.xsl,v 1.1 2005/04/12 10:21:35 iay Exp $</xsl:param>
-
-	<!--
-		Add a comment to the start of the output file.
-	-->
-	<xsl:template match="/">
-		<xsl:comment>
-			<xsl:text>&#10;&#9;***DO NOT EDIT THIS FILE***&#10;&#10;</xsl:text>
-			<xsl:text>&#9;Converted by:&#10;&#10;&#9;</xsl:text>
-			<xsl:value-of select="substring-before(substring-after($cvsId, ': '), '$')"/>
-			<xsl:text>&#10;</xsl:text>
-		</xsl:comment>
-		<xsl:apply-templates/>
-	</xsl:template>
-
-	<!--Force UTF-8 encoding for the output.-->
-	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
-
-	<!--trust10:Trust is the root element for the trust file.  Process it by changing the default namespace used and recursing.-->
-	<xsl:template match="trust10:Trust">
-		<Trust>
-			<!-- <xsl:apply-templates select="@*"/> -->
-			<xsl:apply-templates/>
-		</Trust>
-	</xsl:template>
-
-	<!--trust10:KeyAuthority appears in the trust file, and needs its namespace changing.  After that, we need to reorder its nested elements a little.-->
-	<xsl:template match="trust10:KeyAuthority">
-		<KeyAuthority>
-			<xsl:apply-templates select="ds:KeyInfo"/>
-			<Subject>
-				<xsl:value-of select="ds:KeyName"/>
-			</Subject>
-		</KeyAuthority>
-	</xsl:template>
-
-	<!--
-		Generic recursive copy for ds:* elements.
-		
-		This works better than an xsl:copy-of because it does not copy across spurious
-		namespace nodes.
-	-->
-	<xsl:template match="ds:*">
-		<xsl:element name="{name()}">
-			<xsl:apply-templates select="ds:* | text() | comment() | @*"/>
-		</xsl:element>
-	</xsl:template>
-
-	<!--By default, copy text blocks, comments and attributes unchanged.-->
-	<xsl:template match="text()|comment()|@*">
-		<xsl:copy/>
-	</xsl:template>
-
-	<!--By default, copy all elements from the input to the output, along with their attributes and contents.-->
-	<xsl:template match="*">
-		<xsl:copy>
-			<xsl:apply-templates select="node()|@*"/>
-		</xsl:copy>
-	</xsl:template>
-
-</xsl:stylesheet>