summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-10-28 15:18:12 +0200
committerLeif Johansson <leifj@sunet.se>2011-10-28 15:18:12 +0200
commit2996da433d7e854eb622cb6c0dbf240da06a466d (patch)
treeb1df7d4dd5c2306a48f769b550dc3ebb6365afdf /src
parentd19ece52f819d686500551c261d2a25f833439ff (diff)
more md
Diffstat (limited to 'src')
-rw-r--r--src/installer/resources/wayfconfig.xml8
1 files changed, 2 insertions, 6 deletions
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>