Update djnro metadata. Make tidy for inacademia followed unwillingly

1 files changed, 57 insertions, 65 deletions

diff --git a/swamid-2.0/inacademia.org-metadata-t01-p-test.xml b/swamid-2.0/inacademia.org-metadata-t01-p-test.xml
index cb08e154..e108b2f9 100644
--- a/swamid-2.0/inacademia.org-metadata-t01-p-test.xml
+++ b/swamid-2.0/inacademia.org-metadata-t01-p-test.xml
@@ -1,28 +1,23 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"
-                      xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                      xmlns:ns2="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ns3="http://www.w3.org/2000/09/xmldsig#"
-                      entityID="https://inacademia.org/metadata/t01-p-test.xml">
-    <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false"
-                         protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-        <ns0:Extensions>
-            <ns1:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                                   Location="https://t01.t.inacademia.org/svs/disco" index="1"/>
-            <ns2:UIInfo>
-                <ns2:DisplayName xml:lang="en">InAcademia.org - TEST</ns2:DisplayName>
-                <ns2:Description xml:lang="en">The InAcademia Simple validation Sevice assists services in the easy and privacy preserving validation of
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns2="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ns3="http://www.w3.org/2000/09/xmldsig#" entityID="https://inacademia.org/metadata/t01-p-test.xml">
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns1:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://t01.t.inacademia.org/svs/disco" index="1"/>
+      <ns2:UIInfo>
+        <ns2:DisplayName xml:lang="en">InAcademia.org - TEST</ns2:DisplayName>
+        <ns2:Description xml:lang="en">The InAcademia Simple validation Sevice assists services in the easy and privacy preserving validation of
                     academic affiliation (Student, Faculty, Staff). This is a TEST instance
                 </ns2:Description>
-                <ns2:Keywords xml:lang="en">Affiliation Validation Eligibility GÉANT</ns2:Keywords>
-                <ns2:Logo height="60" width="120" xml:lang="en">https://inacademia.org/static/logo.png</ns2:Logo>
-                <ns2:InformationURL xml:lang="en">https://inacademia.org/about</ns2:InformationURL>
-                <ns2:PrivacyStatementURL xml:lang="en">https://inacademia.org/about/privacy</ns2:PrivacyStatementURL>
-            </ns2:UIInfo>
-        </ns0:Extensions>
-        <ns0:KeyDescriptor use="encryption">
-            <ns3:KeyInfo>
-                <ns3:X509Data>
-                    <ns3:X509Certificate>MIIEHTCCAwWgAwIBAgIJAN85rXmh2X8PMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD
+        <ns2:Keywords xml:lang="en">Affiliation Validation Eligibility GÉANT</ns2:Keywords>
+        <ns2:Logo height="60" width="120" xml:lang="en">https://inacademia.org/static/logo.png</ns2:Logo>
+        <ns2:InformationURL xml:lang="en">https://inacademia.org/about</ns2:InformationURL>
+        <ns2:PrivacyStatementURL xml:lang="en">https://inacademia.org/about/privacy</ns2:PrivacyStatementURL>
+      </ns2:UIInfo>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns3:KeyInfo>
+        <ns3:X509Data>
+          <ns3:X509Certificate>MIIEHTCCAwWgAwIBAgIJAN85rXmh2X8PMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD
                         VQQGEwJFVTETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDET
                         MBEGA1UECgwKSW5BY2FkZW1pYTEcMBoGA1UECwwTU2lnbmluZyBDZXJ0aWZpY2F0
                         ZTEXMBUGA1UEAwwOaW5hY2FkZW1pYS5vcmcxIjAgBgkqhkiG9w0BCQEWE3RlY2hA
@@ -46,13 +41,13 @@
                         GFBECWegI4MjC6cgpz+fU28cRQW9okJkE6/ssGfZDXc8k3z1x3NJYI50rbKfCc+y
                         NA==
                     </ns3:X509Certificate>
-                </ns3:X509Data>
-            </ns3:KeyInfo>
-        </ns0:KeyDescriptor>
-        <ns0:KeyDescriptor use="signing">
-            <ns3:KeyInfo>
-                <ns3:X509Data>
-                    <ns3:X509Certificate>MIIEHTCCAwWgAwIBAgIJAN85rXmh2X8PMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD
+        </ns3:X509Data>
+      </ns3:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns3:KeyInfo>
+        <ns3:X509Data>
+          <ns3:X509Certificate>MIIEHTCCAwWgAwIBAgIJAN85rXmh2X8PMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD
                         VQQGEwJFVTETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDET
                         MBEGA1UECgwKSW5BY2FkZW1pYTEcMBoGA1UECwwTU2lnbmluZyBDZXJ0aWZpY2F0
                         ZTEXMBUGA1UEAwwOaW5hY2FkZW1pYS5vcmcxIjAgBgkqhkiG9w0BCQEWE3RlY2hA
@@ -76,41 +71,38 @@
                         GFBECWegI4MjC6cgpz+fU28cRQW9okJkE6/ssGfZDXc8k3z1x3NJYI50rbKfCc+y
                         NA==
                     </ns3:X509Certificate>
-                </ns3:X509Data>
-            </ns3:KeyInfo>
-        </ns0:KeyDescriptor>
-        <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
-        <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                                      Location="https://t01.t.inacademia.org/svs/acs/post" index="1"/>
-        <ns0:AttributeConsumingService index="1">
-            <ns0:ServiceName xml:lang="en">InAcademia.org - TEST</ns0:ServiceName>
-            <ns0:ServiceDescription xml:lang="en">The InAcademia Simple validation Sevice assists services in the easy and privacy preserving validation of
+        </ns3:X509Data>
+      </ns3:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://t01.t.inacademia.org/svs/acs/post" index="1"/>
+    <ns0:AttributeConsumingService index="1">
+      <ns0:ServiceName xml:lang="en">InAcademia.org - TEST</ns0:ServiceName>
+      <ns0:ServiceDescription xml:lang="en">The InAcademia Simple validation Sevice assists services in the easy and privacy preserving validation of
                     academic affiliation (Student, Faculty, Staff). This is a TEST instance
             </ns0:ServiceDescription>
-            <ns0:RequestedAttribute FriendlyName="edupersonaffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"
-                                    NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-            <ns0:RequestedAttribute FriendlyName="schachomeorganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9"
-                                    NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        </ns0:AttributeConsumingService>
-    </ns0:SPSSODescriptor>
-    <ns0:Organization>
-        <ns0:OrganizationName xml:lang="en">InAcademia</ns0:OrganizationName>
-        <ns0:OrganizationDisplayName xml:lang="en">InAcademia</ns0:OrganizationDisplayName>
-        <ns0:OrganizationURL xml:lang="en">https://inacademia.org/about</ns0:OrganizationURL>
-    </ns0:Organization>
-    <ns0:ContactPerson contactType="support">
-        <ns0:GivenName>InAcademia</ns0:GivenName>
-        <ns0:SurName>Enduser Support</ns0:SurName>
-        <ns0:EmailAddress>mailto:support@inacademia.org</ns0:EmailAddress>
-    </ns0:ContactPerson>
-    <ns0:ContactPerson contactType="technical">
-        <ns0:GivenName>InAcademia</ns0:GivenName>
-        <ns0:SurName>Administrative Support</ns0:SurName>
-        <ns0:EmailAddress>mailto:admin@inacademia.org</ns0:EmailAddress>
-    </ns0:ContactPerson>
-    <ns0:ContactPerson contactType="technical">
-        <ns0:GivenName>InAcademia</ns0:GivenName>
-        <ns0:SurName>Technical Support</ns0:SurName>
-        <ns0:EmailAddress>mailto:tech@inacademia.org</ns0:EmailAddress>
-    </ns0:ContactPerson>
+      <ns0:RequestedAttribute FriendlyName="edupersonaffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <ns0:RequestedAttribute FriendlyName="schachomeorganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </ns0:AttributeConsumingService>
+  </ns0:SPSSODescriptor>
+  <ns0:Organization>
+    <ns0:OrganizationName xml:lang="en">InAcademia</ns0:OrganizationName>
+    <ns0:OrganizationDisplayName xml:lang="en">InAcademia</ns0:OrganizationDisplayName>
+    <ns0:OrganizationURL xml:lang="en">https://inacademia.org/about</ns0:OrganizationURL>
+  </ns0:Organization>
+  <ns0:ContactPerson contactType="support">
+    <ns0:GivenName>InAcademia</ns0:GivenName>
+    <ns0:SurName>Enduser Support</ns0:SurName>
+    <ns0:EmailAddress>mailto:support@inacademia.org</ns0:EmailAddress>
+  </ns0:ContactPerson>
+  <ns0:ContactPerson contactType="technical">
+    <ns0:GivenName>InAcademia</ns0:GivenName>
+    <ns0:SurName>Administrative Support</ns0:SurName>
+    <ns0:EmailAddress>mailto:admin@inacademia.org</ns0:EmailAddress>
+  </ns0:ContactPerson>
+  <ns0:ContactPerson contactType="technical">
+    <ns0:GivenName>InAcademia</ns0:GivenName>
+    <ns0:SurName>Technical Support</ns0:SurName>
+    <ns0:EmailAddress>mailto:tech@inacademia.org</ns0:EmailAddress>
+  </ns0:ContactPerson>
 </ns0:EntityDescriptor>