From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Sun, 11 Feb 2007 21:26:42 +0000 (+0000)
Subject: Remove 1.1-compat. files, include old shib schema for attribute interop.
X-Git-Tag: 2.4~1012
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=1f325b414dcecd572cec48974d0d89cf2e6800b4;hp=70494ba5388a08234c084fd45fc75a74d080b393;p=shibboleth%2Fsp.git

Remove 1.1-compat. files, include old shib schema for attribute interop.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2165 cb58f699-b61c-0410-a6fe-9272a202ed29
---

diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index ed57c54..02f0cf8 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -6,14 +6,12 @@ pkgxmldir = $(datadir)/xml/@PACKAGE@
 
 pkgxml_DATA = \
 	catalog.xml \
+	shibboleth.xsd \
     shibboleth-metadata-1.0.xsd \
     shibboleth-spconfig-2.0.xsd \
-            shibboleth.xsd \
-			metadata_v12_to_v11.xsl \
-			metadata_v12_to_v13.xsl \
-			metadata_v13_to_v12.xsl \
-			trust_v12_to_v11.xsl \
-			trust_v13_to_v12.xsl
+    metadata_v12_to_v13.xsl \
+    metadata_v13_to_v12.xsl \
+    trust_v13_to_v12.xsl
 
 #
 # Some of these need building
diff --git a/schemas/catalog.xml.in b/schemas/catalog.xml.in
index cd58fe1..998a40e 100644
--- a/schemas/catalog.xml.in
+++ b/schemas/catalog.xml.in
@@ -3,4 +3,5 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
     <uri name="urn:mace:shibboleth:metadata:1.0" uri="@-PKGXMLDIR-@/shibboleth-metadata-1.0.xsd"/>
     <uri name="urn:mace:shibboleth:sp:config:2.0" uri="@-PKGXMLDIR-@/shibboleth-spconfig-2.0.xsd"/>
+    <uri name="urn:mace:shibboleth:1.0" uri="@-PKGXMLDIR-@/shibboleth.xsd"/>
 </catalog>
diff --git a/schemas/metadata_v12_to_v11.xsl b/schemas/metadata_v12_to_v11.xsl
deleted file mode 100644
index 13301be..0000000
--- a/schemas/metadata_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$
--->
-<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$</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/schemas/trust_v12_to_v11.xsl b/schemas/trust_v12_to_v11.xsl
deleted file mode 100644
index b444ea6..0000000
--- a/schemas/trust_v12_to_v11.xsl
+++ /dev/null
@@ -1,85 +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$
--->
-<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$</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>
-