From ca19e1aeccc299295d581aab6e9f409f85c248c2 Mon Sep 17 00:00:00 2001
From: root <root@ds1.sunet.se>
Date: Tue, 29 Jun 2010 23:47:21 +0200
Subject: import 1.1.

---
 src/installer/resources/wayfconfig.xml | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'src/installer/resources/wayfconfig.xml')

diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml
index 1cd22d7..a797b54 100644
--- a/src/installer/resources/wayfconfig.xml
+++ b/src/installer/resources/wayfconfig.xml
@@ -18,11 +18,12 @@
      The jspFile & errorJspFile attributes control the display
 
      The provideList attribute controls whether a single list of all
-     possible IdPs is presented.  The default wayf.jsp works best
-     if this is true when provideListofList is true.
+     possible IdPs is presented.  This also controls whether the
+     Quick search dialog is presented.
      
      The provideListOfList attribute controls whether multiple lists
-     are presented (one for each MetadataProvider).
+     are presented (one for each MetadataProvider). Rather than all
+     the entities as one.
 
      The showUsableIdPs attribute controls the contents of the above
      lists.  The single list (provideList=true) is trimmed by
@@ -43,8 +44,8 @@
         <Default 
             jspFile="wayf.jsp"
             errorJspFile="wayferror.jsp"
-            provideList="false"
-            provideListOfList="true"
+            provideList="true"
+            provideListOfList="false"
             warnOnBadBinding="false"
             showUnusableIdPs="false">
             <SearchIgnore>
@@ -156,4 +157,17 @@
     </DiscoveryServiceHandler>  
 -->
 
+<!--  The Javascript handler downloads javascript arrays with the IdPs and the cookies -->
+    <DiscoveryServiceHandler
+        location=".+/js.wayf"
+        provideList="true"
+        provideListOfList="false"
+        default="false"
+        jspFile="/javascript.jsp">
+        <Federation identifier="FirstSite"/>
+        <PluginInstance identifier="CookiePlugin"/>
+    </DiscoveryServiceHandler>
+
+
+
 </WayfConfig>
-- 
cgit v1.1