urkund new entityID

1 files changed, 74 insertions, 74 deletions

diff --git a/swamid-interfederations-2.0/urn-mace-incommon-mcnc.org.xml b/swamid-interfederations-2.0/urn-mace-incommon-mcnc.org.xml
index ea186007..25761108 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-mcnc.org.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-mcnc.org.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:mcnc.org">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">mcnc.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">MCNC</mdui:DisplayName>
-      </mdui:UIInfo>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+        </saml:Attribute>
+      </mdattr:EntityAttributes>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+    <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">mcnc.org</shibmd:Scope>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="en">MCNC</mdui:DisplayName>
+        </mdui:UIInfo>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIJAKPDo3j6X66pMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDXNoaWIubWNuYy5vcmcwHhcNMTMxMjEzMTU0ODE4WhcNMzMxMjEzMTU0ODE4
 WjAYMRYwFAYDVQQDEw1zaGliLm1jbmMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -37,13 +37,13 @@ KJsQKCUT/4ZZoYJVFCBDShlu4igbXjNuBdL1gCsnlL8VWEbWbNJVMqzknZs4QWNw
 EUWUdnmWZjKjlk0102QEkIUvLU7en3kNqsmuPjw92IY2YhQPIH3J2RTas/FQjIL8
 nN1kNG2Jp9SMNpbgU3AYpY0oEFwoZ5QaEk0kYGPfE06xkiSOH0axJzPUWQ0yg1K+
           </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIJAPKCnaTdOvUTMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDXNoaWIubWNuYy5vcmcwHhcNMTAxMjIyMTgzMzMwWhcNMTMxMjIxMTgzMzMw
 WjAYMRYwFAYDVQQDEw1zaGliLm1jbmMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -62,24 +62,24 @@ iNSnodKcEBwA2xzg/5JBoN8+c2lfA3RErnNE6H1krRSdFUIf6qqvjAsAC4tiaNoX
 qpDN0kQQPXRDoNTOQwq3dsk8Ln3Xath+S+qGl7S4hvAx4uSwRBvq9NC8nbpPOePy
 yON7kOgCmBkorVBXljwXBx36Q7X8jMYI/CQtHFcH2M05Ld8oOU31/m8xiOGruasK
           </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mcnc.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mcnc.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.mcnc.org/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.mcnc.org/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.mcnc.org/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.mcnc.org/idp/profile/SAML2/POST-SimpleSign/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">mcnc.org</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mcnc.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mcnc.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.mcnc.org/idp/profile/Shibboleth/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.mcnc.org/idp/profile/SAML2/Redirect/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.mcnc.org/idp/profile/SAML2/POST/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.mcnc.org/idp/profile/SAML2/POST-SimpleSign/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">mcnc.org</shibmd:Scope>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIJAKPDo3j6X66pMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDXNoaWIubWNuYy5vcmcwHhcNMTMxMjEzMTU0ODE4WhcNMzMxMjEzMTU0ODE4
 WjAYMRYwFAYDVQQDEw1zaGliLm1jbmMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -98,13 +98,13 @@ KJsQKCUT/4ZZoYJVFCBDShlu4igbXjNuBdL1gCsnlL8VWEbWbNJVMqzknZs4QWNw
 EUWUdnmWZjKjlk0102QEkIUvLU7en3kNqsmuPjw92IY2YhQPIH3J2RTas/FQjIL8
 nN1kNG2Jp9SMNpbgU3AYpY0oEFwoZ5QaEk0kYGPfE06xkiSOH0axJzPUWQ0yg1K+
           </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIJAPKCnaTdOvUTMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDXNoaWIubWNuYy5vcmcwHhcNMTAxMjIyMTgzMzMwWhcNMTMxMjIxMTgzMzMw
 WjAYMRYwFAYDVQQDEw1zaGliLm1jbmMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -123,27 +123,27 @@ iNSnodKcEBwA2xzg/5JBoN8+c2lfA3RErnNE6H1krRSdFUIf6qqvjAsAC4tiaNoX
 qpDN0kQQPXRDoNTOQwq3dsk8Ln3Xath+S+qGl7S4hvAx4uSwRBvq9NC8nbpPOePy
 yON7kOgCmBkorVBXljwXBx36Q7X8jMYI/CQtHFcH2M05Ld8oOU31/m8xiOGruasK
           </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mcnc.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mcnc.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">MCNC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">MCNC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mcnc.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Steve Thorpe</md:GivenName>
-    <md:EmailAddress>thorpe@mcnc.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Keith Venters</md:GivenName>
-    <md:EmailAddress>kventers@mcnc.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>MCNC Help Desk</md:GivenName>
-    <md:EmailAddress>support@mcnc.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mcnc.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mcnc.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    </md:AttributeAuthorityDescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">MCNC</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">MCNC</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://www.mcnc.org/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Steve Thorpe</md:GivenName>
+      <md:EmailAddress>thorpe@mcnc.org</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Keith Venters</md:GivenName>
+      <md:EmailAddress>kventers@mcnc.org</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>MCNC Help Desk</md:GivenName>
+      <md:EmailAddress>support@mcnc.org</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>