only include SP:s in swamid-sp-transitive.xml (not AA:s), include AA:s in swamid-idp-transitive.xml

3 files changed, 27 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 0940d4a6..e1c91bf9 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ swamid-interfederations-idp-2.0.xml: swamid-interfederations-2.0.mxml
 	@xsltproc --xinclude xslt/extract-idp.xslt swamid-interfederations-2.0.mxml > swamid-interfederations-idp-2.0.xml
 
 swamid-interfederations-sp-2.0.xml: swamid-interfederations-2.0.mxml
-	@xsltproc --xinclude xslt/extract-non-idp.xslt swamid-interfederations-2.0.mxml > swamid-interfederations-sp-2.0.xml
+	@xsltproc --xinclude xslt/extract-sp.xslt swamid-interfederations-2.0.mxml > swamid-interfederations-sp-2.0.xml
 
 swamid-externals-sp-2.0.xml: swamid-externals-2.0.mxml
 	@xsltproc --xinclude xslt/extract-non-idp.xslt swamid-externals-2.0.mxml > swamid-externals-sp-2.0.xml
diff --git a/xslt/extract-idp.xslt b/xslt/extract-idp.xslt
index 32824386..4858876f 100644
--- a/xslt/extract-idp.xslt
+++ b/xslt/extract-idp.xslt
@@ -14,7 +14,7 @@
 
   <xsl:template match="/md:EntitiesDescriptor">
   <md:EntitiesDescriptor>
-    <xsl:apply-templates select="md:EntityDescriptor[md:IDPSSODescriptor]"/>
+    <xsl:apply-templates select="md:EntityDescriptor[md:IDPSSODescriptor]|md:EntityDescriptor[md:AttributeAuthorityDescriptor]"/>
   </md:EntitiesDescriptor>
   </xsl:template>
 
diff --git a/xslt/extract-sp.xslt b/xslt/extract-sp.xslt
new file mode 100644
index 00000000..058504e3
--- /dev/null
+++ b/xslt/extract-sp.xslt
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+                xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+                xmlns:exsl="http://exslt.org/common"
+                extension-element-prefixes="exsl"
+                xmlns:xi="http://www.w3.org/2001/XInclude"
+                xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
+
+  <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
+
+  <xsl:template match="/md:EntitiesDescriptor">
+  <md:EntitiesDescriptor>
+    <xsl:apply-templates select="md:EntityDescriptor[md:SPSSODescriptor]"/>
+  </md:EntitiesDescriptor>
+  </xsl:template>
+
+  <xsl:template match="md:EntityDescriptor">
+     <xi:include><xsl:attribute name="href"><xsl:value-of select="@xml:base"/></xsl:attribute></xi:include>
+  </xsl:template>
+
+</xsl:stylesheet>