From 2c4fa71680f536230f29ce6422e0909deed8d3a9 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Thu, 8 May 2014 15:09:33 +0200
Subject: Resolves SWAMIDOPS-7224

---
 swamid-2.0/dirg.org.umu.se-443-sp.xml | 73 ----------------------------------
 swamid-2.0/dirg.org.umu.se-sp.xml     | 74 +++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 73 deletions(-)
 delete mode 100644 swamid-2.0/dirg.org.umu.se-443-sp.xml
 create mode 100644 swamid-2.0/dirg.org.umu.se-sp.xml

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/dirg.org.umu.se-443-sp.xml b/swamid-2.0/dirg.org.umu.se-443-sp.xml
deleted file mode 100644
index 9645982a..00000000
--- a/swamid-2.0/dirg.org.umu.se-443-sp.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dirg.org.umu.se:443/sp.xml">
-  <ns0:Extensions>
-    <ns1:EntityAttributes>
-      <ns2:Attribute Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
-        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </ns0:Extensions>
-  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns4:UIInfo>
-        <ns4:DisplayName xml:lang="en">DIRG web</ns4:DisplayName>
-        <ns4:Description xml:lang="en">ITS - DIRG unit external webpage.</ns4:Description>
-        <ns4:Logo height="50" width="60" xml:lang="en">https://dirg.org.umu.se/static/dirg_green_fp.png</ns4:Logo>
-      </ns4:UIInfo>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns5:KeyInfo>
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIICVzCCAcACCQCD0IEgR/GBozANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCQUMxDTALBgNVBAcMBFVtZWExDDAKBgNVBAoMA0lUUzEMMAoG
-A1UECwwDSVRTMQ0wCwYDVQQDDARESVJHMRowGAYJKoZIhvcNAQkBFgtkaXJnQHVt
-dS5zZTAeFw0xNDAyMDcxNDI3MDBaFw0xNTAyMDcxNDI3MDBaMHAxCzAJBgNVBAYT
-AnNlMQswCQYDVQQIDAJBQzENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDSVRTMQww
-CgYDVQQLDANJVFMxDTALBgNVBAMMBERJUkcxGjAYBgkqhkiG9w0BCQEWC2RpcmdA
-dW11LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbpaYV1RzKKYbWAJGQ
-szgiUgrP16ODFpNJloj1Tm5FIYUbcetCbwbPp3417mHObQS7rBvTm/ZJe2bbnenN
-l4qRZWZSwmXDvDeIinAxwkr4C/rK392TKfHMfej1hDL2IeCn5oY7Fl2DTjDTAjKd
-5KBaTqwIh0J3sJxUICQFpQ0rFwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFhpGdSZ
-A6gAcjDA5Wqd0HTtpqkWqEbVKPtxI0pBnFy4J5CARk43R2yn1sHH/HRNTuTcZEmB
-xz6UWuCYykD4kDTwppQdXn4l3/RkA1NOLvSse3P3Db7JbK5EkjHRyWCRnhREloh9
-606LRX1Kc0uWKNEBRs6uN9VA9aiIHVHpRboU
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns5:KeyInfo>
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIICVzCCAcACCQCD0IEgR/GBozANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCQUMxDTALBgNVBAcMBFVtZWExDDAKBgNVBAoMA0lUUzEMMAoG
-A1UECwwDSVRTMQ0wCwYDVQQDDARESVJHMRowGAYJKoZIhvcNAQkBFgtkaXJnQHVt
-dS5zZTAeFw0xNDAyMDcxNDI3MDBaFw0xNTAyMDcxNDI3MDBaMHAxCzAJBgNVBAYT
-AnNlMQswCQYDVQQIDAJBQzENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDSVRTMQww
-CgYDVQQLDANJVFMxDTALBgNVBAMMBERJUkcxGjAYBgkqhkiG9w0BCQEWC2RpcmdA
-dW11LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbpaYV1RzKKYbWAJGQ
-szgiUgrP16ODFpNJloj1Tm5FIYUbcetCbwbPp3417mHObQS7rBvTm/ZJe2bbnenN
-l4qRZWZSwmXDvDeIinAxwkr4C/rK392TKfHMfej1hDL2IeCn5oY7Fl2DTjDTAjKd
-5KBaTqwIh0J3sJxUICQFpQ0rFwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFhpGdSZ
-A6gAcjDA5Wqd0HTtpqkWqEbVKPtxI0pBnFy4J5CARk43R2yn1sHH/HRNTuTcZEmB
-xz6UWuCYykD4kDTwppQdXn4l3/RkA1NOLvSse3P3Db7JbK5EkjHRyWCRnhREloh9
-606LRX1Kc0uWKNEBRs6uN9VA9aiIHVHpRboU
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dirg.org.umu.se:443/acsredirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dirg.org.umu.se:443/acspost" index="2"/>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization>
-    <ns0:OrganizationName xml:lang="en">Umeå Universitet, ITS - DIRG</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="se">Umeå Univeristet, ITS - DIRG</ns0:OrganizationDisplayName>
-    <ns0:OrganizationDisplayName xml:lang="en">Umeå University, ITS - DIRG</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://dirg.org.umu.se/page/home</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson contactType="technical">
-    <ns0:GivenName>Hans</ns0:GivenName>
-    <ns0:SurName>Hörberg</ns0:SurName>
-    <ns0:EmailAddress>dirg@umu.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</ns0:EntityDescriptor>
diff --git a/swamid-2.0/dirg.org.umu.se-sp.xml b/swamid-2.0/dirg.org.umu.se-sp.xml
new file mode 100644
index 00000000..cb44b252
--- /dev/null
+++ b/swamid-2.0/dirg.org.umu.se-sp.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ns5="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns6="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dirg.org.umu.se/sp.xml">
+  <ns0:Extensions>
+    <ns1:EntityAttributes>
+      <ns2:Attribute Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue>
+      </ns2:Attribute>
+    </ns1:EntityAttributes>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns4:UIInfo>
+        <ns4:DisplayName xml:lang="en">DIRG web</ns4:DisplayName>
+        <ns4:Description xml:lang="en">ITS - DIRG unit external webpage.</ns4:Description>
+        <ns4:Logo height="50" width="60" xml:lang="en">https://dirg.org.umu.se/static/dirg_green_fp.png</ns4:Logo>
+      </ns4:UIInfo>
+      <ns5:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dirg.org.umu.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns6:KeyInfo>
+        <ns6:X509Data>
+          <ns6:X509Certificate>MIICVzCCAcACCQCD0IEgR/GBozANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCQUMxDTALBgNVBAcMBFVtZWExDDAKBgNVBAoMA0lUUzEMMAoG
+A1UECwwDSVRTMQ0wCwYDVQQDDARESVJHMRowGAYJKoZIhvcNAQkBFgtkaXJnQHVt
+dS5zZTAeFw0xNDAyMDcxNDI3MDBaFw0xNTAyMDcxNDI3MDBaMHAxCzAJBgNVBAYT
+AnNlMQswCQYDVQQIDAJBQzENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDSVRTMQww
+CgYDVQQLDANJVFMxDTALBgNVBAMMBERJUkcxGjAYBgkqhkiG9w0BCQEWC2RpcmdA
+dW11LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbpaYV1RzKKYbWAJGQ
+szgiUgrP16ODFpNJloj1Tm5FIYUbcetCbwbPp3417mHObQS7rBvTm/ZJe2bbnenN
+l4qRZWZSwmXDvDeIinAxwkr4C/rK392TKfHMfej1hDL2IeCn5oY7Fl2DTjDTAjKd
+5KBaTqwIh0J3sJxUICQFpQ0rFwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFhpGdSZ
+A6gAcjDA5Wqd0HTtpqkWqEbVKPtxI0pBnFy4J5CARk43R2yn1sHH/HRNTuTcZEmB
+xz6UWuCYykD4kDTwppQdXn4l3/RkA1NOLvSse3P3Db7JbK5EkjHRyWCRnhREloh9
+606LRX1Kc0uWKNEBRs6uN9VA9aiIHVHpRboU
+</ns6:X509Certificate>
+        </ns6:X509Data>
+      </ns6:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns6:KeyInfo>
+        <ns6:X509Data>
+          <ns6:X509Certificate>MIICVzCCAcACCQCD0IEgR/GBozANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJz
+ZTELMAkGA1UECAwCQUMxDTALBgNVBAcMBFVtZWExDDAKBgNVBAoMA0lUUzEMMAoG
+A1UECwwDSVRTMQ0wCwYDVQQDDARESVJHMRowGAYJKoZIhvcNAQkBFgtkaXJnQHVt
+dS5zZTAeFw0xNDAyMDcxNDI3MDBaFw0xNTAyMDcxNDI3MDBaMHAxCzAJBgNVBAYT
+AnNlMQswCQYDVQQIDAJBQzENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDSVRTMQww
+CgYDVQQLDANJVFMxDTALBgNVBAMMBERJUkcxGjAYBgkqhkiG9w0BCQEWC2RpcmdA
+dW11LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbpaYV1RzKKYbWAJGQ
+szgiUgrP16ODFpNJloj1Tm5FIYUbcetCbwbPp3417mHObQS7rBvTm/ZJe2bbnenN
+l4qRZWZSwmXDvDeIinAxwkr4C/rK392TKfHMfej1hDL2IeCn5oY7Fl2DTjDTAjKd
+5KBaTqwIh0J3sJxUICQFpQ0rFwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFhpGdSZ
+A6gAcjDA5Wqd0HTtpqkWqEbVKPtxI0pBnFy4J5CARk43R2yn1sHH/HRNTuTcZEmB
+xz6UWuCYykD4kDTwppQdXn4l3/RkA1NOLvSse3P3Db7JbK5EkjHRyWCRnhREloh9
+606LRX1Kc0uWKNEBRs6uN9VA9aiIHVHpRboU
+</ns6:X509Certificate>
+        </ns6:X509Data>
+      </ns6:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dirg.org.umu.se/acsredirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dirg.org.umu.se/acspost" index="2"/>
+  </ns0:SPSSODescriptor>
+  <ns0:Organization>
+    <ns0:OrganizationName xml:lang="en">Umeå University, ITS - DIRG</ns0:OrganizationName>
+    <ns0:OrganizationDisplayName xml:lang="se">Umeå univeristet, ITS - DIRG</ns0:OrganizationDisplayName>
+    <ns0:OrganizationDisplayName xml:lang="en">Umeå University, ITS - DIRG</ns0:OrganizationDisplayName>
+    <ns0:OrganizationURL xml:lang="en">https://dirg.org.umu.se/page/home</ns0:OrganizationURL>
+  </ns0:Organization>
+  <ns0:ContactPerson contactType="technical">
+    <ns0:GivenName>Hans</ns0:GivenName>
+    <ns0:SurName>Hörberg</ns0:SurName>
+    <ns0:EmailAddress>dirg@umu.se</ns0:EmailAddress>
+  </ns0:ContactPerson>
+</ns0:EntityDescriptor>
-- 
cgit v1.2.3