From 2996da433d7e854eb622cb6c0dbf240da06a466d Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 28 Oct 2011 15:18:12 +0200
Subject: more md

---
 src/installer/resources/wayfconfig.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml
index 789ab4c..ffd8908 100644
--- a/src/installer/resources/wayfconfig.xml
+++ b/src/installer/resources/wayfconfig.xml
@@ -167,41 +167,37 @@
     <DiscoveryServiceHandler location="https://ds.swamid.se(:[0-9]+)?/.+/ClearCache.wayf" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
        <PluginInstance identifier="DeleteCookiePlugin"/>
        <Federation identifier="SWAMID-1.0"/>
-       <Federation identifier="SWAMID-2.0"/>
     </DiscoveryServiceHandler>
 
     <DiscoveryServiceHandler location="https://ds.swamid.se(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
        <PluginInstance identifier="CookiePlugin"/>
        <Federation identifier="SWAMID-1.0"/>
-       <Federation identifier="SWAMID-2.0"/>
     </DiscoveryServiceHandler>
 
     <DiscoveryServiceHandler location="https://wayf.swamid.se(:[0-9]+)?/.+/ClearCache.wayf" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
        <PluginInstance identifier="DeleteCookiePlugin"/>
        <Federation identifier="SWAMID-1.0"/>
-       <Federation identifier="SWAMID-2.0"/>
     </DiscoveryServiceHandler>
 
     <DiscoveryServiceHandler location="https://wayf.swamid.se(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
        <PluginInstance identifier="CookiePlugin"/>
        <Federation identifier="SWAMID-1.0"/>
-       <Federation identifier="SWAMID-2.0"/>
     </DiscoveryServiceHandler>
 
     <DiscoveryServiceHandler location="https://ds.sunet.se(:[0-9]+)?/.+/ClearCache.wayf" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
        <PluginInstance identifier="DeleteCookiePlugin"/>
        <Federation identifier="SWAMID-1.0"/>
-       <Federation identifier="SWAMID-2.0"/>
     </DiscoveryServiceHandler>
 
     <DiscoveryServiceHandler location="https://ds.sunet.se(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
        <PluginInstance identifier="CookiePlugin"/>
        <Federation identifier="SWAMID-1.0"/>
-       <Federation identifier="SWAMID-2.0"/>
     </DiscoveryServiceHandler>
 
     <DiscoveryServiceHandler provideListOfList="true" location="https://idp-test.nordu.net(:[0-9]+)?/(.+/)?(DS|WAYF)/?" jspFile="wayf-ndn.jsp" errorJspFile="wayferror.jsp">
        <PluginInstance identifier="CookiePlugin"/>
+       <Federation identifier="SWAMID-1.0"/>
+       <Federation identifier="Kalmar2"/>
     </DiscoveryServiceHandler>
 
 </WayfConfig>
-- 
cgit v1.1