http://mds.edugain.org into swamid-interfederations-2.0

1 files changed, 153 insertions, 156 deletions

diff --git a/swamid-interfederations-2.0/shibb.srv.hull-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb.srv.hull-college.ac.uk-idp-shibboleth.xml
index 7658df3e..80765d28 100644
--- a/swamid-interfederations-2.0/shibb.srv.hull-college.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibb.srv.hull-college.ac.uk-idp-shibboleth.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb.srv.hull-college.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Group (Test)" Shibboleth IdP for Hull College.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb.srv.hull-college.ac.uk/idp/shibboleth">
+  <md:Extensions>
     <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
@@ -12,204 +9,204 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-19T12:41:49Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hull-college.ac.uk</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Hull College Group (Test)</mdui:DisplayName>
         <mdui:Description xml:lang="en">eResources Identity Provider for Hull College Group (test)</mdui:Description>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIDXDCCAkSgAwIBAgIVAPLJKoYdnvpZkJQ8zxC9wmtu4DQOMA0GCSqGSIb3DQEB
-						CwUAMCcxJTAjBgNVBAMMHHNoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWswHhcN
-						MTUwMzEzMTA0NjA3WhcNMzUwMzEzMTA0NjA3WjAnMSUwIwYDVQQDDBxzaGliYi5z
-						cnYuaHVsbC1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAtuu+pe36GMhfcWB19D0PjpOmjqCLsEuZ3ALayq0NYhBzB/B6iob3NMkp
-						aqW6nmmgCvpP50oLfM7v60/+25hqFkWi+kltpMeLN0cOO/wElT1g2wxAG9WfC0yh
-						+odZ/VG7nBhm0E6hSCsh/tX9K/ztTh3j5HQDBjT7O0YqI3zYkh516Bj3tLTcotct
-						v5Y0Ru8Hx2HEWn/qdVSXnNgZtzktgt1J+G83hGUpeYJBPKCUyE9K19lYCgXQNS38
-						YWNewtTl7T3Ps582CUBOiqJpLLx7Acn0peT+o/WbCbYHlkjtjaZ5unepN0r2Vwf7
-						DbmAWzQx75X8IkwQBFENAyy8kLqfgQIDAQABo38wfTAdBgNVHQ4EFgQUNTnZsubn
-						79v5Oqrb86MB/P0Yqq4wXAYDVR0RBFUwU4Icc2hpYmIuc3J2Lmh1bGwtY29sbGVn
-						ZS5hYy51a4YzaHR0cHM6Ly9zaGliYi5zcnYuaHVsbC1jb2xsZWdlLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAs0NwH79cXb+jUnRApkzQ3
-						7YgmgwWonbkzE9leuinuX79XCexhZSNjNNrI4M5eLkBpXN2TwXnKqbeLTOFSJlOD
-						AljLlLzCA2wnnNTTXe+QzU86TOhOueFR9SMC0tHT5/rW3NSKBwNLEC1pTGVwChGC
-						xLcUkclGWispzDgJ+KD3Xqg6Pg1P9UyrMVqwNT2wqlj3ZlRYjzoBHyfcDsXKNcHT
-						ADT2SsS6LJQXrUhUFutLhuOcRolrpOgyfqNc3XsRx+iezpb3n6pfl1m8Vo9POHwD
-						aAifs85Qj1w+J1xKXFbPYYigWAgDbwzwcQKgJDbXeoNtB24TPgnBfDl/YQVg+jMp
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						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
+						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
-						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
+						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
-						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
+						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
-						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
+						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
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						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
+						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
-						NTAzMTMxMDQ2MDdaFw0zNTAzMTMxMDQ2MDdaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
+						NTA0MTQxNTAyNTZaFw0zNTA0MTQxNTAyNTZaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
 						di5odWxsLWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						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
+						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
-						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
+						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
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <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://shibb.srv.hull-college.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.srv.hull-college.ac.uk/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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hull-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						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
+						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
-						MTUwMzEzMTA0NjA3WhcNMzUwMzEzMTA0NjA3WjAnMSUwIwYDVQQDDBxzaGliYi5z
+						MTUwNDE0MTUwMjU2WhcNMzUwNDE0MTUwMjU2WjAnMSUwIwYDVQQDDBxzaGliYi5z
 						cnYuaHVsbC1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						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
+						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
-						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
+						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
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <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://shibb.srv.hull-college.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.srv.hull-college.ac.uk/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">hull-college.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						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
+						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
-						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
+						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
-						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
+						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
-						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
+						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
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIDWzCCAkOgAwIBAgIUW/AruquJr7i6LDilMxCp3mYiNBIwDQYJKoZIhvcNAQEL
+						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
-						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
+						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
-						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
+						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
-						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
+						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
+					</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>
+						MIIDXDCCAkSgAwIBAgIVAMBxtBNygxJDhz+XICMyMyNDz3M5MA0GCSqGSIb3DQEB
+						CwUAMCcxJTAjBgNVBAMMHHNoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWswHhcN
+						MTUwNDE0MTUwMjU2WhcNMzUwNDE0MTUwMjU2WjAnMSUwIwYDVQQDDBxzaGliYi5z
+						cnYuaHVsbC1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAg250fL+LAgg5QkLp3uYHVclUitYgFXvZomu3gTPlKOxb+2DE0PeqpeBF
+						zFdK1+8LrfwjNm8rqW+jNVUmP+aJ+vWKbmS79feYnMBe08L0OY/UX5IqBVRlWok0
+						LXsD8Q6cyKT2zZeImPsUZLcvl0f30wm9cQ+37OEz0ow2ehKzzuDSoz2aJNOrbN0l
+						nsvuYSIH/8hg/UXq3vw69WvpXtMNN2VOghwE71bgpO3iELpoAPctM8X7SOvUwme/
+						zB/vNquTdmkZTGqem33NIjvulXbnuAqTpFq45wQPF1Jw/eaxtKm9+LR3TNu+1zRO
+						Erfa82aM62iFNY0H0wi/ZMN29sJ/6wIDAQABo38wfTAdBgNVHQ4EFgQUn+mHuBYA
+						PXywHU2WZU/KDimiWCwwXAYDVR0RBFUwU4Icc2hpYmIuc3J2Lmh1bGwtY29sbGVn
+						ZS5hYy51a4YzaHR0cHM6Ly9zaGliYi5zcnYuaHVsbC1jb2xsZWdlLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBdKX+mFvFM/3bT+EnCL5zB
+						GOwVBTSueTupZCkJ0TICbYNZtBIpjBEGuloIofqrEEWJxv8nf1wjTANQeCsXawVH
+						5WX67WVvH/AGOgiOkAoETn6pTJwD+mbPphiMuxpmCbfIDSkc8KPBv01Dd4RgNt6t
+						E5F20miUKgEllVBKrOta8VQaI9RLuYxAXUkdUUDEEKBZ7NEabbzeQAdjue17T6ho
+						zT7PWljk4zS+ZQWYtm8ZSJGnAtzf2qkeBqRuVe7KpVUSHSnVmXkkAS5BTBqiZ4jj
+						rRv8ji64j4NqrLPTYWSGAwjjQzwvB8BQZ2Jgks7AO/yOvWD3M56uPKIxIMf/RCgE
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Hull College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hull College Group (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hull-college.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Perry</SurName>
-    <EmailAddress>mailto:Dave.Perry@hull-college.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Perry</SurName>
-    <EmailAddress>mailto:Dave.Perry@hull-college.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Hull College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hull College Group (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hull-college.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Perry</md:SurName>
+    <md:EmailAddress>mailto:Dave.Perry@hull-college.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Perry</md:SurName>
+    <md:EmailAddress>mailto:Dave.Perry@hull-college.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>