From bc1d55080e5d42e6ef2bba892d640aa8f68bbc90 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Mon, 6 Mar 2023 10:35:43 +0100
Subject: Removed organization/* files and function to add missing organization
 in xslt/normalize.xsl

---
 organization/gu.se.xml     | 6 ------
 organization/it.gu.se.xml  | 1 -
 organization/ki.se.xml     | 6 ------
 organization/nordu.net.xml | 6 ------
 organization/sunet.se.xml  | 6 ------
 organization/swamid.se.xml | 6 ------
 xslt/normalize.xsl         | 6 ------
 7 files changed, 37 deletions(-)
 delete mode 100644 organization/gu.se.xml
 delete mode 120000 organization/it.gu.se.xml
 delete mode 100644 organization/ki.se.xml
 delete mode 100644 organization/nordu.net.xml
 delete mode 100644 organization/sunet.se.xml
 delete mode 100644 organization/swamid.se.xml

diff --git a/organization/gu.se.xml b/organization/gu.se.xml
deleted file mode 100644
index 41173156..00000000
--- a/organization/gu.se.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<md:Organization xmlns:md='urn:oasis:names:tc:SAML:2.0:metadata'>
-   <md:OrganizationName xml:lang="en">GU</md:OrganizationName>
-   <md:OrganizationDisplayName xml:lang="en">Göteborgs universitet</md:OrganizationDisplayName>
-   <md:OrganizationURL xml:lang="en">http://www.gu.se</md:OrganizationURL>
-</md:Organization>
diff --git a/organization/it.gu.se.xml b/organization/it.gu.se.xml
deleted file mode 120000
index 2f90cb3e..00000000
--- a/organization/it.gu.se.xml
+++ /dev/null
@@ -1 +0,0 @@
-gu.se.xml
\ No newline at end of file
diff --git a/organization/ki.se.xml b/organization/ki.se.xml
deleted file mode 100644
index 0957b605..00000000
--- a/organization/ki.se.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<md:Organization xmlns:md='urn:oasis:names:tc:SAML:2.0:metadata'>
-   <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
-   <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
-   <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
-</md:Organization>
diff --git a/organization/nordu.net.xml b/organization/nordu.net.xml
deleted file mode 100644
index 90eee399..00000000
--- a/organization/nordu.net.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<md:Organization xmlns:md='urn:oasis:names:tc:SAML:2.0:metadata'>
-    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-</md:Organization>
diff --git a/organization/sunet.se.xml b/organization/sunet.se.xml
deleted file mode 100644
index 8a58408a..00000000
--- a/organization/sunet.se.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<md:Organization xmlns:md='urn:oasis:names:tc:SAML:2.0:metadata'>
-    <md:OrganizationName xml:lang="en">SUNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish University Network (SUNET)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sunet.se</md:OrganizationURL>
-</md:Organization>
diff --git a/organization/swamid.se.xml b/organization/swamid.se.xml
deleted file mode 100644
index 25ad55cd..00000000
--- a/organization/swamid.se.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<md:Organization xmlns:md='urn:oasis:names:tc:SAML:2.0:metadata'>
-    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
-</md:Organization>
diff --git a/xslt/normalize.xsl b/xslt/normalize.xsl
index 67dabe72..f3c086ac 100644
--- a/xslt/normalize.xsl
+++ b/xslt/normalize.xsl
@@ -65,18 +65,12 @@ If You do not accept these Terms, then You must not continue to use this Metadat
     <xsl:variable name="domain">
        <xsl:value-of select="substring-after($host,'.')"/>
     </xsl:variable>
-    <xsl:variable name="orginfo">
-       <xsl:value-of select="concat('../organization','/',$domain,'.xml')"/>
-    </xsl:variable>
     <md:EntityDescriptor>
        <xsl:apply-templates select="@*"/>
        <xsl:if test="$rpi='true' and not(md:Extensions)">
           <md:Extensions><xsl:call-template name="add-swamid-ri"/></md:Extensions>
        </xsl:if>
        <xsl:apply-templates select="text()|comment()|md:Extensions|md:RoleDescriptor|md:IDPSSODescriptor|md:SPSSODescriptor|md:AuthnAuthorityDescriptor|md:AttributeAuthorityDescriptor|md:PDPDescriptor|md:AffiliationDescriptor"/>
-       <xsl:if test="$org='true' and not(md:Organization)">
-          <xsl:apply-templates select="document($orginfo)"/>
-       </xsl:if>
        <xsl:apply-templates select="md:Organization"/>
        <xsl:if test="$defaultContact='true' and not(md:ContactPerson)">
           <md:ContactPerson contactType="technical"><md:EmailAddress>operations@swamid.se</md:EmailAddress></md:ContactPerson>
-- 
cgit v1.2.3