pilot environment

2 files changed, 5 insertions, 46 deletions

diff --git a/swamid-2.0/pilot.idp.eduid.se-idp.xml b/swamid-2.0/pilot.idp.eduid.se-idp.xml
index 0712aee1..30ae45d8 100644
--- a/swamid-2.0/pilot.idp.eduid.se-idp.xml
+++ b/swamid-2.0/pilot.idp.eduid.se-idp.xml
@@ -1,13 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:mace:shibboleth:metadata:1.0" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://pilot.idp.eduid.se/idp.xml">
-  <ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:Scope regexp="false">eduid.se</ns1:Scope>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns2:KeyInfo>
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIIDXjCCAhagAwIBAgIEUpw56jANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDExUy
+<?xml version='1.0' encoding='UTF-8'?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:mace:shibboleth:metadata:1.0" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://pilot.idp.eduid.se/idp.xml"><ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><ns0:Extensions><ns1:Scope regexp="false">pilot.eduid.se</ns1:Scope></ns0:Extensions><ns0:KeyDescriptor use="encryption"><ns2:KeyInfo><ns2:X509Data><ns2:X509Certificate>MIIDXjCCAhagAwIBAgIEUpw56jANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDExUy
 MDEzMTIwMi5pZHAuZWR1aWQuc2UwHhcNMTMxMjAyMDc0MjM2WhcNMTYxMjAxMDc0
 MzI5WjAgMR4wHAYDVQQDExUyMDEzMTIwMi5pZHAuZWR1aWQuc2UwggFSMA0GCSqG
 SIb3DQEBAQUAA4IBPwAwggE6AoIBMQDBUWjILLi4wc4It2A1IJHOx1ho87XAYYqR
@@ -26,14 +18,7 @@ lAKHUrahuhbPDQhFjBwBX6rmRlDlMqNLhDdmlNPxg6xUbNpJIi6OnG/YpVRjbgcg
 1JUccanKdjA79iR/QeMGaJHmBm/iVTmq4XQSaeBi3nfkTrxZdHD+UsP7TXorwD9Y
 p5fHVO1o2XawoMuliRxlRkSbfW79b1XeKXBkV93clVkWc4M2VxBAsaT6yEwOLdif
 7js=
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns2:KeyInfo>
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIIDXjCCAhagAwIBAgIEUpw56jANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDExUy
+</ns2:X509Certificate></ns2:X509Data></ns2:KeyInfo></ns0:KeyDescriptor><ns0:KeyDescriptor use="signing"><ns2:KeyInfo><ns2:X509Data><ns2:X509Certificate>MIIDXjCCAhagAwIBAgIEUpw56jANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDExUy
 MDEzMTIwMi5pZHAuZWR1aWQuc2UwHhcNMTMxMjAyMDc0MjM2WhcNMTYxMjAxMDc0
 MzI5WjAgMR4wHAYDVQQDExUyMDEzMTIwMi5pZHAuZWR1aWQuc2UwggFSMA0GCSqG
 SIb3DQEBAQUAA4IBPwAwggE6AoIBMQDBUWjILLi4wc4It2A1IJHOx1ho87XAYYqR
@@ -52,31 +37,4 @@ lAKHUrahuhbPDQhFjBwBX6rmRlDlMqNLhDdmlNPxg6xUbNpJIi6OnG/YpVRjbgcg
 1JUccanKdjA79iR/QeMGaJHmBm/iVTmq4XQSaeBi3nfkTrxZdHD+UsP7TXorwD9Y
 p5fHVO1o2XawoMuliRxlRkSbfW79b1XeKXBkV93clVkWc4M2VxBAsaT6yEwOLdif
 7js=
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pilot.idp.eduid.se/slo/soap"/>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pilot.idp.eduid.se/slo/post"/>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pilot.idp.eduid.se/slo/redirect"/>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pilot.idp.eduid.se/sso/redirect"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pilot.idp.eduid.se/sso/post"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pilot.idp.eduid.se/sso/art"/>
-  </ns0:IDPSSODescriptor>
-  <ns0:Organization>
-    <ns0:OrganizationName xml:lang="en">eduID PILOT</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">eduID PILOT</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson contactType="technical">
-    <ns0:GivenName>eduID</ns0:GivenName>
-    <ns0:SurName>developers</ns0:SurName>
-    <ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>support@eduid.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</ns0:EntityDescriptor>
+</ns2:X509Certificate></ns2:X509Data></ns2:KeyInfo></ns0:KeyDescriptor><ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pilot.idp.eduid.se/slo/soap" /><ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pilot.idp.eduid.se/slo/post" /><ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pilot.idp.eduid.se/slo/redirect" /><ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat><ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat><ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pilot.idp.eduid.se/sso/redirect" /><ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pilot.idp.eduid.se/sso/post" /><ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pilot.idp.eduid.se/sso/art" /></ns0:IDPSSODescriptor><ns0:Organization><ns0:OrganizationName xml:lang="en">eduID PILOT</ns0:OrganizationName><ns0:OrganizationDisplayName xml:lang="en">eduID PILOT</ns0:OrganizationDisplayName><ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL></ns0:Organization><ns0:ContactPerson contactType="technical"><ns0:GivenName>eduID</ns0:GivenName><ns0:SurName>developers</ns0:SurName><ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress></ns0:ContactPerson><ns0:ContactPerson contactType="support"><ns0:GivenName>Support</ns0:GivenName><ns0:EmailAddress>support@eduid.se</ns0:EmailAddress></ns0:ContactPerson></ns0:EntityDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 965f5849..a0bf87c9 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -41,4 +41,5 @@
   <xi:include href="swamid-2.0/shibboleth.umu.se-test.xml"/>
   <xi:include href="swamid-2.0/pilot.idp.eduid.se-idp.xml"/>
   <xi:include href="swamid-2.0/dev.idp.eduid.se-idp.xml"/>
+  <xi:include href="swamid-2.0/pilot.idp.eduid.se-idp.xml"/>
 </EntitiesDescriptor>