From 97825dc24f555d7f735b05d49216c174f9f13cb7 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Sun, 18 Jul 2010 23:01:42 +0200
Subject: major update for the sunet ds

---
 src/installer/resources/wayfconfig.xml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'src/installer/resources')

diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml
index f6c468b..9ebdd12 100644
--- a/src/installer/resources/wayfconfig.xml
+++ b/src/installer/resources/wayfconfig.xml
@@ -131,11 +131,13 @@
 
  <!-- The ClearCache handler causes the cookie to be deleted.  The jsp shipped
      with the WAYF refers to this handler -->
-        
+    
+<!--    
     <DiscoveryServiceHandler
         location=".+/ClearCache.wayf">
         <PluginInstance identifier="DeleteCookiePlugin"/>
     </DiscoveryServiceHandler>  
+-->
 
 <!-- Example of how to constrain a DiscoveryService to one (or more)
      explicit metadata sources.  (The default is to use all metadata
@@ -159,15 +161,27 @@
         <PluginInstance identifier="CookiePlugin"/>
     </DiscoveryServiceHandler>
 
-    <DiscoveryServiceHandler location="https://ds.sunet.se/.+" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
+    <DiscoveryServiceHandler location="https://ds.swamid.se(:[0-9]+)?/.+/ClearCache.wayf" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
+       <PluginInstance identifier="DeleteCookiePlugin"/>
+    </DiscoveryServiceHandler>
+
+    <DiscoveryServiceHandler location="https://ds.swamid.se(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
        <PluginInstance identifier="CookiePlugin"/>
     </DiscoveryServiceHandler>
 
-    <DiscoveryServiceHandler location="https://ds.swamid.se/.+" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
+    <DiscoveryServiceHandler location="https://wayf.swamid.se(:[0-9]+)?/.+/ClearCache.wayf" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
+       <PluginInstance identifier="DeleteCookiePlugin"/>
+    </DiscoveryServiceHandler>
+
+    <DiscoveryServiceHandler location="https://wayf.swamid.se(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
        <PluginInstance identifier="CookiePlugin"/>
     </DiscoveryServiceHandler>
 
-    <DiscoveryServiceHandler location="https://wayf.swamid.se/.+" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
+    <DiscoveryServiceHandler location="https://ds.sunet.se(:[0-9]+)?/.+/ClearCache.wayf" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
+       <PluginInstance identifier="DeleteCookiePlugin"/>
+    </DiscoveryServiceHandler>
+
+    <DiscoveryServiceHandler location="https://ds.sunet.se(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
        <PluginInstance identifier="CookiePlugin"/>
     </DiscoveryServiceHandler>
 
-- 
cgit v1.1