From 890548bc9de43f871c6ab6fe8d483e7fd27e93fe Mon Sep 17 00:00:00 2001
From: leifj <leifj@0878fbc5-a6f2-46f6-b174-cb7b08c221d1>
Date: Thu, 8 Apr 2010 09:18:20 +0000
Subject: nb10 och ft10 update

git-svn-id: svn+ssh://svn.it.su.se/svn/swamid-metadata/trunk@323 0878fbc5-a6f2-46f6-b174-cb7b08c221d1
---
 nya-1.0/ft10.ladok.umu.se-idp.xml | 27 ++++++++++++++++++---------
 nya-1.0/nb10.ladok.umu.se-idp.xml |  2 +-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/nya-1.0/ft10.ladok.umu.se-idp.xml b/nya-1.0/ft10.ladok.umu.se-idp.xml
index b213789d..0b3a6061 100644
--- a/nya-1.0/ft10.ladok.umu.se-idp.xml
+++ b/nya-1.0/ft10.ladok.umu.se-idp.xml
@@ -21,27 +21,27 @@ MIIDDjCCAfagAwIBAgIJAIgv/MARZ+4MMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNVBAMTA2lkcDAeFw0x
         </KeyDescriptor>
         
         <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   Location="https://ft10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" 
                                    index="1"/>
 
         <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
+                                   Location="https://ft10.ladok.umu.se:8443/shibboleth-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://ft10.ladok.umu.se/idp/profile/Shibboleth/SSO" />
+                             Location="https://ft10.ladok.umu.se:444/shibboleth-idp/profile/Shibboleth/SSO" />
         
         <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://ft10.ladok.umu.se/idp/profile/SAML2/POST/SSO" />
+                             Location="https://ft10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/POST/SSO" />
 
         <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://ft10.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+                             Location="https://ft10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO" />
         
         <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://ft10.ladok.umu.se/idp/profile/SAML2/Redirect/SSO" />
+                             Location="https://ft10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/Redirect/SSO" />
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -61,14 +61,23 @@ MIIDDjCCAfagAwIBAgIJAIgv/MARZ+4MMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNVBAMTA2lkcDAeFw0x
         </KeyDescriptor>
 
         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+                          Location="https://ft10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery" />
         
         <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+                          Location="https://ft10.ladok.umu.se:8443/shibboleth-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="en">studera.nu</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">studera.nu (ft10)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.studera.nu</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Umeå university</Company>
+    <EmailAddress>fredrik.aslund@ladok.umu.se</EmailAddress>
+  </ContactPerson>
     
-</EntityDescriptor>    
\ No newline at end of file
+</EntityDescriptor>    
diff --git a/nya-1.0/nb10.ladok.umu.se-idp.xml b/nya-1.0/nb10.ladok.umu.se-idp.xml
index 32c9cb92..30701cd1 100644
--- a/nya-1.0/nb10.ladok.umu.se-idp.xml
+++ b/nya-1.0/nb10.ladok.umu.se-idp.xml
@@ -71,7 +71,7 @@ MIIDDjCCAfagAwIBAgIJAMpOmLHAAQ5bMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNVBAMTA2lkcDAeFw0x
     </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">studera.nu</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">studera.nu</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">studera.nu (nb10)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.studera.nu</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
-- 
cgit v1.2.3