From 082505f6cc7b2cde8981ae914a4e3f3ac58398a5 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 18 Sep 2007 13:30:56 +0000
Subject: [PATCH] Stop building and publishing SDSS federation metadata.

---
 build.xml             | 190 ++++--------------------------------------
 build/master_sdss.xsl | 121 ---------------------------
 2 files changed, 14 insertions(+), 297 deletions(-)
 delete mode 100644 build/master_sdss.xsl

diff --git a/build.xml b/build.xml
index 836a99f8..02befa30 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-	Federation metadata signing process for the SDSS and UK federations.
+	Federation metadata signing process for the UK federation.
 	
 	* "ant process" generates the other files from the master file, and
 	  signs as appropriate.  Requires the keystore password.
@@ -12,20 +12,6 @@
 	The files involved are:
 	
 	[0]		master [+entity fragment files]
-	[1]			sdss-metadata-unsigned
-	[2]				== sdss-sites-13-unsigned
-	[3]				sdss-metadata
-	[4]					== sdss-sites-13
-	[5]				sdss-sites-12-unsigned
-	[6]					== sdss-sites-unsigned
-	[7]					sdss-sites-12
-	[8]						== sdss-sites
-	[11]			sdss-trust-12-unsigned
-	[12]				== sdss-trust-unsigned
-	[13]				sdss-trust-12
-	[14]					== sdss-trust
-	[17]			sdss-wayf-unsigned.xml
-	[18]				sdss-wayf.xml
 	[19]		ukfederation-metadata-unsigned.xml
 	[20]			ukfederation-metadata.xml
 	[21]			ukfederation-sites-12-unsigned.xml
@@ -95,19 +81,7 @@
 	
 	<!--
 		Keystore files and key aliases.
-		
-		Each federation has a keystore for signing, and a second for verification.
-		Each of these keystores has a location and a key alias to use.
-		
-		We make the assumption here that all keystores and keys use the same
-		password, which is the new UK Federation one rather than the older
-		and weaker SDSS Federation password.
 	-->
-	<property name="keystore.sdss.loc" value="${keystore.base.loc}"/>
-	<property name="keystore.sdss.sign.loc" value="${keystore.sdss.loc}/sdss-sign.jks"/>
-	<property name="keystore.sdss.sign.alias" value="sdss"/>
-	<property name="keystore.sdss.vfy.loc" value="${keystore.sdss.loc}/sdss.jks"/>
-	<property name="keystore.sdss.vfy.alias" value="sdss"/>
 	<property name="keystore.uk.loc" value="${keystore.base.loc}"/>
 	<property name="keystore.uk.sign.loc" value="${keystore.uk.loc}/ukfederation-sign.jks"/>
 	<property name="keystore.uk.sign.alias" value="ukfederation"/>
@@ -117,7 +91,6 @@
 	<!--
 		Files within the XML directory.
 	-->
-	<property name="sdss.master.file" value="sdss-metadata-unsigned.xml"/>
 	<property name="uk.master.file" value="ukfederation-metadata-unsigned.xml"/>
 	
 	<property name="known.hosts" value="${build.dir}/known_hosts"/>
@@ -143,17 +116,17 @@
 	-->
 	<target name="push" depends="get.remote.pass">
 		<!--
-			Push metadata files for the SDSS Federation.
+			Push metadata files to the old SDSS federation location.
+			
+			Nowadays, these are not SDSS federation metadata files but other
+			miscellaneous files such as UK federation statistics.
 		-->
-		<echo>Pushing SDSS Federation metadata files.</echo>
+		<echo>Pushing non-metadata files.</echo>
 		<scp failonerror="true" password="${remote.pass}" remoteTodir="${remote.loc.sdss}"
 				knownhosts="${known.hosts}">
 			<fileset dir="${xml.dir}">
-				<include name="*.xml"/>
+				<include name="members.xml"/>
 				<include name="ukfederation-members.xsd"/>
-				<exclude name="ukfederation-*.xml"/>
-				<exclude name="entities.xml"/>
-				<exclude name="sdss-wayf-unsigned.xml"/>
 				<include name="ukfederation-stats.html"/>
 			</fileset>
 		</scp>
@@ -175,7 +148,7 @@
 	<!--
 		Generate unsigned metadata.
 	-->
-	<target name="generate" depends="gen.sdss, gen.uk">
+	<target name="generate" depends="gen.uk">
 		<echo>Generated unsigned metadata.</echo>
 	</target>
 	
@@ -219,53 +192,6 @@
 		</concat>
 	</target>
 	
-	<!--
-		Unsigned metadata generation for the SDSS Federation.
-	-->
-
-	<target name="gen.sdss" depends="gen.sdss.master, gen.sdss.1.3, gen.sdss.1.2, gen.sdss.wayf">
-		<echo>Generated SDSS unsigned metadata.</echo>
-	</target>
-
-	<target name="gen.sdss.master" depends="gen.entities">
-		<echo>Generating unsigned SDSS master file.</echo>
-		<!-- [1] -->
-		<XALAN x="master_sdss.xsl" i="${master.file.name}"
-			o="${sdss.master.file}" />
-		<fixcrlf file="${xml.dir}/${sdss.master.file}" eol="lf"/>
-	</target>
-	
-	<target name="gen.sdss.1.3">
-		<echo>Generating unsigned SDSS V1.3 metadata.</echo>
-		<!-- [2] -->
-		<copy overwrite="yes" file="${xml.dir}/${sdss.master.file}"
-			tofile="${xml.dir}/sdss-sites-13-unsigned.xml"/>
-	</target>
-
-	<target name="gen.sdss.1.2">
-		<echo>Generating unsigned SDSS V1.2 metadata.</echo>
-		<!-- [5] -->
-		<XALAN x="v13_to_v12_sites.xsl" i="${sdss.master.file}"
-			o="sdss-sites-12-unsigned.xml"/>
-		<fixcrlf file="${xml.dir}/sdss-sites-12-unsigned.xml" eol="lf"/>
-		<!-- [6] -->
-		<copy overwrite="yes" file="${xml.dir}/sdss-sites-12-unsigned.xml"
-			tofile="${xml.dir}/sdss-sites-unsigned.xml"/>
-		<!-- [11] -->
-		<XALAN x="v13_to_v12_trust.xsl" i="${sdss.master.file}"
-			o="sdss-trust-12-unsigned.xml"/>
-		<fixcrlf file="${xml.dir}/sdss-trust-12-unsigned.xml" eol="lf"/>
-		<!-- [12] -->
-		<copy overwrite="yes" file="${xml.dir}/sdss-trust-12-unsigned.xml"
-			tofile="${xml.dir}/sdss-trust-unsigned.xml"/>
-	</target>
-	
-	<target name="gen.sdss.wayf">
-		<echo>Generating unsigned SDSS WAYF metadata.</echo>
-		<!-- [17] -->
-		<XALAN x="master_to_wayf.xsl" i="sdss-metadata-unsigned.xml" o="sdss-wayf-unsigned.xml"/>
-	</target>
-	
 	<!--
 		Unsigned metadata generation for the UK Federation.
 	-->
@@ -345,63 +271,10 @@
 		Sign the various metadata files.
 	-->
 	
-	<target name="sign" depends="sign.sdss, sign.uk">
+	<target name="sign" depends="sign.uk">
 		<echo>Generated signed metadata.</echo>
 	</target>
 	
-	<!--
-		SDSS Federation signing.
-	-->
-
-	<macrodef name="SIGN.sdss">
-		<attribute name="i"/>
-		<attribute name="o"/>
-		<sequential>
-			<MDT i="@{i}" o="@{o}" keystore="${keystore.sdss.sign.loc}" alias="${keystore.sdss.sign.alias}">
-				<args>
-					<arg value="--sign"/>
-					<arg value="--password"/>
-					<arg value="${keystore.pass}"/>
-				</args>
-			</MDT>
-		</sequential>
-	</macrodef>
-	
-	<target name="sign.sdss" depends="sign.sdss.1.3, sign.sdss.1.2, sign.sdss.wayf">
-		<echo>Generated signed SDSS metadata.</echo>
-	</target>
-	
-	<target name="sign.sdss.1.3">
-		<echo>Signing SDSS V1.3 metadata.</echo>
-		<!-- [3] -->
-		<SIGN.sdss i="${sdss.master.file}" o="sdss-metadata.xml"/>
-		<!-- [4] -->
-		<copy overwrite="yes" file="${xml.dir}/sdss-metadata.xml"
-			tofile="${xml.dir}/sdss-sites-13.xml"/>
-		<!-- [20] -->
-		<SIGN.uk i="${uk.master.file}" o="ukfederation-metadata.xml"/>
-	</target>
-
-	<target name="sign.sdss.1.2">
-		<echo>Signing SDSS V1.2 metadata.</echo>
-		<!-- [7] -->
-		<SIGN.sdss i="sdss-sites-12-unsigned.xml" o="sdss-sites-12.xml"/>
-		<!-- [8] -->
-		<copy overwrite="yes" file="${xml.dir}/sdss-sites-12.xml"
-			tofile="${xml.dir}/sdss-sites.xml"/>
-		<!-- [13] -->
-		<SIGN.sdss i="sdss-trust-12-unsigned.xml" o="sdss-trust-12.xml"/>
-		<!-- [14] -->
-		<copy overwrite="yes" file="${xml.dir}/sdss-trust-12.xml"
-			tofile="${xml.dir}/sdss-trust.xml"/>
-	</target>
-
-	<target name="sign.sdss.wayf">
-		<echo>Signing SDSS WAYF metadata.</echo>
-		<!-- [18] -->
-		<SIGN.sdss i="sdss-wayf-unsigned.xml" o="sdss-wayf.xml"/>
-	</target>
-	
 	<macrodef name="SIGN.uk">
 		<attribute name="i"/>
 		<attribute name="o"/>
@@ -445,49 +318,10 @@
 	<!--
 		Verify the signed metadata files.
 	-->
-	<target name="verify" depends="verify.sdss, verify.uk">
+	<target name="verify" depends="verify.uk">
 		<echo>Verification completed.</echo>
 	</target>
 	
-	<!--
-		Verification of the SDSS Federation metadata.
-	-->
-	<macrodef name="VFY.sdss">
-		<attribute name="i"/>
-		<sequential>
-			<MDT i="@{i}" o="temp.xml" keystore="${keystore.sdss.vfy.loc}" alias="${keystore.sdss.vfy.alias}"/>
-			<touch file="${xml.dir}/temp.xml"/>
-			<delete file="${xml.dir}/temp.xml" quiet="true"/>
-		</sequential>
-	</macrodef>
-
-	<target name="verify.sdss" depends="verify.sdss.1.3, verify.sdss.1.2, verify.sdss.wayf">
-		<echo>Verified signed SDSS metadata.</echo>
-	</target>
-
-	<target name="verify.sdss.1.3">
-		<echo>Verifying signed SDSS V1.3 metadata.</echo>
-		<VFY.sdss i="sdss-metadata.xml"/>
-		<VFY.sdss i="sdss-sites-13.xml"/>
-	</target>
-	
-	<target name="verify.sdss.1.2">
-		<echo>Verifying signed SDSS V1.2 metadata.</echo>
-		<VFY.sdss i="sdss-sites-12.xml"/>
-		<VFY.sdss i="sdss-trust-12.xml"/>
-		<VFY.sdss i="sdss-sites.xml"/>
-		<VFY.sdss i="sdss-trust.xml"/>
-	</target>
-	
-	<target name="verify.sdss.wayf">
-		<echo>Verifying signed SDSS WAYF metadata.</echo>
-		<VFY.sdss i="sdss-wayf.xml"/>
-	</target>
-
-	<target name="verify.uk" depends="verify.uk.1.3, verify.uk.1.2, verify.uk.wayf">
-		<echo>Verified signed UK metadata.</echo>
-	</target>
-
 	<!--
 		Verification of the UK Federation metadata.
 	-->
@@ -500,6 +334,10 @@
 		</sequential>
 	</macrodef>
 		
+	<target name="verify.uk" depends="verify.uk.1.3, verify.uk.1.2, verify.uk.wayf">
+		<echo>Verified signed UK metadata.</echo>
+	</target>
+
 	<target name="verify.uk.1.3">
 		<echo>Verifying signed UK V1.3 metadata.</echo>
 		<VFY.uk   i="ukfederation-metadata.xml"/>
diff --git a/build/master_sdss.xsl b/build/master_sdss.xsl
deleted file mode 100644
index 704e6701..00000000
--- a/build/master_sdss.xsl
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-	master_sdss.xsl
-	
-	XSL stylesheet that takes a SAML 2.0 metadata master file containing
-	a trust fabric and optional entities, and makes an SDSS federation
-	master file by tweaking appropriately and inserting the combined
-	entities file.
-	
-	Author: Ian A. Young <ian@iay.org.uk>
-
--->
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
-	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	xmlns:uklabel="http://ukfederation.org.uk/2006/11/label"
-	xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-	exclude-result-prefixes="wayf uklabel">
-
-	<!--
-		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$</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;Generated by:&#10;&#10;&#9;</xsl:text>
-			<xsl:value-of select="substring-before(substring-after($cvsId, ': '), '$')"/>
-			<xsl:text>&#10;</xsl:text>
-		</xsl:comment>
-		<xsl:comment>
-			<xsl:text>&#10;&#9;S D S S   F E D E R A T I O N   M E T A D A T A&#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"/>
-
-	<!--
-		Root EntitiesDescriptor element.
-		
-		Copy all attributes and nested elements to the output, then
-		insert the entities from the entities file at the end.
-	-->
-	<xsl:template match="/md:EntitiesDescriptor">
-		<xsl:copy>
-			<xsl:apply-templates select="node()|@*"/>
-			<xsl:apply-templates select="document('../xml/entities.xml')/*/md:EntityDescriptor"/>
-		</xsl:copy>
-	</xsl:template>
-
-	<!--
-		Drop any explicit xsi:schemaLocation attributes from imported entity fragments.
-	-->
-	<xsl:template match="@xsi:schemaLocation[parent::md:EntityDescriptor]">
-		<!-- nothing -->
-	</xsl:template>
-	
-	<!--
-		Drop any dummy entities.
-	-->
-	<xsl:template match="md:EntityDescriptor[@entityID='dummy']">
-		<!-- nothing -->
-	</xsl:template>
-	
-	<!--
-		Drop any deleted entities.
-	-->
-	<xsl:template match="md:EntityDescriptor[md:Extensions/uklabel:DeletedEntity]">
-		<!-- nothing -->
-	</xsl:template>
-	
-	<!--
-		Drop any entities defined after the UK Federation went live.
-	-->
-	<xsl:template match="md:EntityDescriptor[number(substring-after(@ID, 'uk'))>=200]">
-		<!-- nothing -->
-	</xsl:template>
-	
-	<!--
-		Drop UK Federation SDSS policy labels; not relevant to SDSS Federation users.
-	-->
-	<xsl:template match="md:EntityDescriptor/md:Extensions">
-		<xsl:variable name="otherExtensions" select="*[local-name()!='SDSSPolicy']"/>
-		<xsl:choose>
-			<xsl:when test="count($otherExtensions)=0">
-				<!-- nothing -->
-			</xsl:when>
-			<xsl:otherwise>
-				<Extensions>
-					<xsl:apply-templates
-						select="text()|comment()|*[local-name()!='SDSSPolicy']"/>
-				</Extensions>
-			</xsl:otherwise>
-		</xsl:choose>
-	</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>