new nb10

git-svn-id: svn+ssh://svn.it.su.se/svn/swamid-metadata/trunk@410 0878fbc5-a6f2-46f6-b174-cb7b08c221d1

1 files changed, 11 insertions, 21 deletions

diff --git a/nya-1.0/nb10.ladok.umu.se-idp.xml b/nya-1.0/nb10.ladok.umu.se-idp.xml
index c6093c8b..1f4588e0 100644
--- a/nya-1.0/nb10.ladok.umu.se-idp.xml
+++ b/nya-1.0/nb10.ladok.umu.se-idp.xml
@@ -14,34 +14,34 @@
             <ds:KeyInfo>
                 <ds:X509Data>
                     <ds:X509Certificate>
-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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://nb10.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   Location="https://nb10.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://nb10.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
+                                   Location="https://nb10.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://nb10.ladok.umu.se:444/idp/profile/Shibboleth/SSO" />
+                             Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/Shibboleth/SSO" />
         
         <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nb10.ladok.umu.se:444/idp/profile/SAML2/POST/SSO" />
+                             Location="https://nb10.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://nb10.ladok.umu.se:444/idp/profile/SAML2/POST-SimpleSign/SSO" />
+                             Location="https://nb10.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://nb10.ladok.umu.se:444/idp/profile/SAML2/Redirect/SSO" />
+                             Location="https://nb10.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">
@@ -54,30 +54,20 @@ MIIDODCCAiCgAwIBAgIJALTrTgTIqPjpMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTAubGFk
             <ds:KeyInfo>
                 <ds:X509Data>
                     <ds:X509Certificate>
-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
+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
                     </ds:X509Certificate>
                 </ds:X509Data>
             </ds:KeyInfo>
-        </KeyDescriptor>
-
+        </KeyDescriptor> 
         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nb10.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+                          Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery" />
         
         <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nb10.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+                          Location="https://nb10.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 (nb10)</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>