1 files changed, 53 insertions, 133 deletions
diff --git a/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml
index 255aae0d..094f7d42 100644
--- a/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.its.fz-juelich.de/idp/shibboleth">
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.its.fz-juelich.de/idp/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-08-13T10:04:08Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fz-juelich.de</saml1md:Scope>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fz-juelich.de</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="de">Forschungszentrum Jülich GmbH</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Forschungszentrum Jülich GmbH</mdui:DisplayName>
@@ -17,48 +17,8 @@
         <mdui:InformationURL xml:lang="de">http://www.fz-juelich.de</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.fz-juelich.de</mdui:InformationURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFwDCCBKigAwIBAgIHF2Szd19csjANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
-MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
-KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MDQwOTExNTgzMloXDTE5
-MDQwODExNTgzMlowgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
-V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
-emVudHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGlj
-aC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyEZ4OJwh5/R7ZB
-NcfP+r4rGj11okOTedH/va1+NvjqXbOD3704Xb9t67RvvMh9opZ2PRlfINmf/JuE
-RB6OuXH6mZRIZQbfsTP6F1npxeh4yPc+psoFdBu45CGX8+drBhNX9RlsNE6pmEvE
-pPPMRO9gBbScEFBmZty+h0Su2/JgKtqyC2alBP6QperUm8zNJ3y3bnRJWfuFnUfJ
-z4FVsxPwYsyY3lh756nGq2ihcEQzmGZ+oRUDxyjeRFWZrlgGyN6oD7ZVFnbFhI8H
-qa7CkvAy/owny/FQuGO6JC4To1bqeSX+Zcn/TV6HuZg6ybE/zUR9dHeU28qKIRPj
-NKGftvkCAwEAAaOCAjIwggIuMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMB
-MBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPnubw0XZJS8MA74
-FBf+epBbXm05MB8GA1UdIwQYMBaAFCC9cYmlySozLxHgH+WUJlYPEQIlMDkGA1Ud
-EQQyMDCCFWlkcC5pdHMuZnotanVlbGljaC5kZYEXd2VibWFzdGVyQGZ6LWp1ZWxp
-Y2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-emotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUHAQEE
-gb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-emotY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQCAv/nuosclU7sm5SDc5LZW8K032GuWk33S7ZAH
-kCmkNB9rPbEBQcKZxEIzIH8TwrMPPTmqZMNPTuhHBdcEmeVnWkr5F1omxxHUn3GF
-MDXMffSER54HMfWSc/D0f8VyyoKHwotD6dYEwSQSWKtPV0Rv4OCf2LGzAukDAXOO
-JaSL11iVqzuAYlUMYQ9TrFmCtf/xr0gbiKL9QgDzOe6P4k2nDid/G7bWZYswbmb7
-nzmhmPE5BMRvs/TBhoqLTzhrLdUyOIToUS5IMkynRqM1Ylf8d4PImgeC7Wyb30IP
-W70+0kLcZsWMkom+vyzZuZjO/6mIzKUUKJeySUawrqBfZK4L
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
         <ds:X509Data>
@@ -98,61 +58,21 @@ WsS4+1PQhtDqnQMdqkPWm1zlseEGiXqFtw==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.its.fz-juelich.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fz-juelich.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFwDCCBKigAwIBAgIHF2Szd19csjANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
-MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
-KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MDQwOTExNTgzMloXDTE5
-MDQwODExNTgzMlowgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
-V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
-emVudHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGlj
-aC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyEZ4OJwh5/R7ZB
-NcfP+r4rGj11okOTedH/va1+NvjqXbOD3704Xb9t67RvvMh9opZ2PRlfINmf/JuE
-RB6OuXH6mZRIZQbfsTP6F1npxeh4yPc+psoFdBu45CGX8+drBhNX9RlsNE6pmEvE
-pPPMRO9gBbScEFBmZty+h0Su2/JgKtqyC2alBP6QperUm8zNJ3y3bnRJWfuFnUfJ
-z4FVsxPwYsyY3lh756nGq2ihcEQzmGZ+oRUDxyjeRFWZrlgGyN6oD7ZVFnbFhI8H
-qa7CkvAy/owny/FQuGO6JC4To1bqeSX+Zcn/TV6HuZg6ybE/zUR9dHeU28qKIRPj
-NKGftvkCAwEAAaOCAjIwggIuMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMB
-MBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPnubw0XZJS8MA74
-FBf+epBbXm05MB8GA1UdIwQYMBaAFCC9cYmlySozLxHgH+WUJlYPEQIlMDkGA1Ud
-EQQyMDCCFWlkcC5pdHMuZnotanVlbGljaC5kZYEXd2VibWFzdGVyQGZ6LWp1ZWxp
-Y2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-emotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUHAQEE
-gb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-emotY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQCAv/nuosclU7sm5SDc5LZW8K032GuWk33S7ZAH
-kCmkNB9rPbEBQcKZxEIzIH8TwrMPPTmqZMNPTuhHBdcEmeVnWkr5F1omxxHUn3GF
-MDXMffSER54HMfWSc/D0f8VyyoKHwotD6dYEwSQSWKtPV0Rv4OCf2LGzAukDAXOO
-JaSL11iVqzuAYlUMYQ9TrFmCtf/xr0gbiKL9QgDzOe6P4k2nDid/G7bWZYswbmb7
-nzmhmPE5BMRvs/TBhoqLTzhrLdUyOIToUS5IMkynRqM1Ylf8d4PImgeC7Wyb30IP
-W70+0kLcZsWMkom+vyzZuZjO/6mIzKUUKJeySUawrqBfZK4L
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.its.fz-juelich.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fz-juelich.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
         <ds:X509Data>
@@ -192,33 +112,33 @@ WsS4+1PQhtDqnQMdqkPWm1zlseEGiXqFtw==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e234</OrganizationName>
-    <OrganizationName xml:lang="en">e234</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Forschungszentrum Jülich GmbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Forschungszentrum Jülich GmbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fz-juelich.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.fz-juelich.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Jens</GivenName>
-    <SurName>Heidbüchel</SurName>
-    <EmailAddress>mailto:j.heidbuechel@fz-juelich.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Jens</GivenName>
-    <SurName>Heidbüchel</SurName>
-    <EmailAddress>mailto:j.heidbuechel@fz-juelich.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>ITS Service Desk</GivenName>
-    <SurName>Forschungszentrum Jülich GmbH</SurName>
-    <EmailAddress>mailto:it-services@fz-juelich.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e234</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e234</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Forschungszentrum Jülich GmbH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Forschungszentrum Jülich GmbH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.fz-juelich.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fz-juelich.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jens</md:GivenName>
+    <md:SurName>Heidbüchel</md:SurName>
+    <md:EmailAddress>mailto:j.heidbuechel@fz-juelich.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jens</md:GivenName>
+    <md:SurName>Heidbüchel</md:SurName>
+    <md:EmailAddress>mailto:j.heidbuechel@fz-juelich.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ITS Service Desk</md:GivenName>
+    <md:SurName>Forschungszentrum Jülich GmbH</md:SurName>
+    <md:EmailAddress>mailto:it-services@fz-juelich.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>