urkund new entityID

1 files changed, 60 insertions, 63 deletions

diff --git a/swamid-interfederations-2.0/test-imagenweb.cambridgeimaging.co.uk-entityid.xml b/swamid-interfederations-2.0/test-imagenweb.cambridgeimaging.co.uk-entityid.xml
index 38209047..9d8b1f67 100644
--- a/swamid-interfederations-2.0/test-imagenweb.cambridgeimaging.co.uk-entityid.xml
+++ b/swamid-interfederations-2.0/test-imagenweb.cambridgeimaging.co.uk-entityid.xml
@@ -1,25 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-imagenweb.cambridgeimaging.co.uk/entityid">
-  <!--
-		This is an "ImagenWeb (beta)" simpleSAMLphp SP for Cambridge Imaging Systems Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-25T12:21:44Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ImagenWeb (beta)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ImagenWeb 2.9 (beta), used for testing only</mdui:Description>
-        <mdui:Logo height="64" width="224">https://test-imagenweb.cambridgeimaging.co.uk/user/templates/global/site-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-imagenweb.cambridgeimaging.co.uk/entityid">
+    <md:Extensions>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-25T12:21:44Z">
+        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+      </mdrpi:RegistrationInfo>
+    </md:Extensions>
+    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <md:Extensions>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="en">ImagenWeb (beta)</mdui:DisplayName>
+          <mdui:Description xml:lang="en">ImagenWeb 2.9 (beta), used for testing only</mdui:Description>
+          <mdui:Logo height="64" width="224">https://test-imagenweb.cambridgeimaging.co.uk/user/templates/global/site-logo.png</mdui:Logo>
+        </mdui:UIInfo>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDezCCAmOgAwIBAgIJAPwwUfeiolEpMA0GCSqGSIb3DQEBBQUAMFQxIjAgBgNV
 						BAoMGUNhbWJyaWRnZSBJbWFnaW5nIFN5c3RlbXMxLjAsBgNVBAMMJXRlc3QtaW1h
 						Z2Vud2ViLmNhbWJyaWRnZWltYWdpbmcuY28udWswHhcNMTMwNDI0MTIwMTI5WhcN
@@ -40,13 +37,13 @@
 						ueK+2BMrsfZchYNf/qH9nRbVS5phEo+RZJbJnqRG7KwVHRMyMNJblleLKqj29Yup
 						fscUgPXFf8x5UJOqq1DjJ+coYkXNsNRtZZy5uH/2nA==
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDezCCAmOgAwIBAgIJAPwwUfeiolEpMA0GCSqGSIb3DQEBBQUAMFQxIjAgBgNV
 						BAoMGUNhbWJyaWRnZSBJbWFnaW5nIFN5c3RlbXMxLjAsBgNVBAMMJXRlc3QtaW1h
 						Z2Vud2ViLmNhbWJyaWRnZWltYWdpbmcuY28udWswHhcNMTMwNDI0MTIwMTI5WhcN
@@ -67,37 +64,37 @@
 						ueK+2BMrsfZchYNf/qH9nRbVS5phEo+RZJbJnqRG7KwVHRMyMNJblleLKqj29Yup
 						fscUgPXFf8x5UJOqq1DjJ+coYkXNsNRtZZy5uH/2nA==
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml2-logout.php/imagenweb"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml2-acs.php/imagenweb" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml1-acs.php/imagenweb" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml2-acs.php/imagenweb" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml1-acs.php/imagenweb/artifact" index="3"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">Test ImagenWeb for federated SSO</ServiceName>
-      <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"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cambridge Imaging Systems Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ImagenWeb (beta)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cambridgeimaging.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tim</GivenName>
-    <SurName>Jobling</SurName>
-    <EmailAddress>mailto:support@cambridgeimaging.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Jobling</SurName>
-    <EmailAddress>mailto:support@cambridgeimaging.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml2-logout.php/imagenweb"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml2-acs.php/imagenweb" index="0"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml1-acs.php/imagenweb" index="1"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml2-acs.php/imagenweb" index="2"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml1-acs.php/imagenweb/artifact" index="3"/>
+      <md:AttributeConsumingService index="0">
+        <md:ServiceName xml:lang="en">Test ImagenWeb for federated SSO</md:ServiceName>
+        <md: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"/>
+        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      </md:AttributeConsumingService>
+    </md:SPSSODescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">Cambridge Imaging Systems Limited</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">ImagenWeb (beta)</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://www.cambridgeimaging.co.uk/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Tim</md:GivenName>
+      <md:SurName>Jobling</md:SurName>
+      <md:EmailAddress>mailto:support@cambridgeimaging.com</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Tim</md:GivenName>
+      <md:SurName>Jobling</md:SurName>
+      <md:EmailAddress>mailto:support@cambridgeimaging.com</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>