From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Thu, 6 May 2010 17:08:11 +0000 (+0000)
Subject: Simplify SessionInitiator example.
X-Git-Tag: 2.4~86
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=53487734c5723ad07cf1a7643f482054e3a7815d

Simplify SessionInitiator example.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/branches/REL_2@3253 cb58f699-b61c-0410-a6fe-9272a202ed29
---

diff --git a/configs/shibboleth2.xml b/configs/shibboleth2.xml
index 71b45e3..aa1086e 100644
--- a/configs/shibboleth2.xml
+++ b/configs/shibboleth2.xml
@@ -105,25 +105,18 @@
             element (or requireSessionWith can specify a specific id to use).
             -->
 
-            <!-- Default example directs to a specific IdP's SSO service (favoring SAML 2 over Shib 1). -->
-            <SessionInitiator type="Chaining" Location="/Login" isDefault="true" id="Intranet"
+            <!-- Default directs to a specific IdP (favoring SAML 2 over Shib 1). -->
+            <SessionInitiator type="Chaining" Location="/Login" isDefault="true" id="Login"
                     relayState="cookie" entityID="https://idp.example.org/shibboleth">
                 <SessionInitiator type="SAML2" acsIndex="1" template="bindingTemplate.html"/>
                 <SessionInitiator type="Shib1" acsIndex="5"/>
-            </SessionInitiator>
-            
-            <!-- An example using an old-style WAYF, which means Shib 1 only unless an entityID is provided. -->
-            <SessionInitiator type="Chaining" Location="/WAYF" id="WAYF" relayState="cookie">
-                <SessionInitiator type="SAML2" acsIndex="1" template="bindingTemplate.html"/>
-                <SessionInitiator type="Shib1" acsIndex="5"/>
-                <SessionInitiator type="WAYF" acsIndex="5" URL="https://wayf.example.org/WAYF"/>
-            </SessionInitiator>
-
-            <!-- An example supporting the new-style of discovery service. -->
-            <SessionInitiator type="Chaining" Location="/DS" id="DS" relayState="cookie">
-                <SessionInitiator type="SAML2" acsIndex="1" template="bindingTemplate.html"/>
-                <SessionInitiator type="Shib1" acsIndex="5"/>
+                <!--
+                To allow for >1 IdP, remove entityID property from Chaining element and add
+                *either* of the SAMLDS or WAYF handlers below:
+                
                 <SessionInitiator type="SAMLDS" URL="https://ds.example.org/DS/WAYF"/>
+                <SessionInitiator type="WAYF" acsIndex="5" URL="https://wayf.example.org/WAYF"/>
+                -->
             </SessionInitiator>
             
             <!--