diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-11-03 10:34:19 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-11-03 10:34:19 +0100 |
| commit | 641d5d92cac2905a5e642165c89b028aeb82648d (patch) | |
| tree | e3cccec1868f4e2960c85eb4e12be1e64ae48697 | |
| parent | 180e0bf4670ddc7c0052416e3eeb1a1c3c525ce7 (diff) | |
combined md
| -rw-r--r-- | src/installer/resources/wayfconfig.xml | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml index 7de9780..16a0020 100644 --- a/src/installer/resources/wayfconfig.xml +++ b/src/installer/resources/wayfconfig.xml @@ -64,13 +64,9 @@ --> - <MetadataProvider displayName="SWAMID" identifier="SWAMID-1.0" - url="http://md.swamid.se/md/swamid-1.0.xml" - backingFile="/opt/shibboleth-ds/metadata/swamid-1.0.xml"/> - - <MetadataProvider displayName="SWAMID 2.0" identifier="SWAMID-2.0" - url="http://md.swamid.se/md/swamid-2.0.xml" - backingFile="/opt/shibboleth-ds/metadata/swamid-2.0.xml"/> + <MetadataProvider displayName="SWAMID" identifier="SWAMID" + url="http://md.swamid.se/md/swamid-no-interfederation-combined.xml" + backingFile="/opt/shibboleth-ds/metadata/swamid-no-interfederation-combined.xml"/> <!-- MetadataProvider displayName="UK Federation" identifier="UKFED" backingFile="/opt/shibboleth-ds/metadata/ukfederation-metadata.xml" @@ -166,43 +162,43 @@ <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"/> </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"/> </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"/> </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"/> </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"/> </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"/> </DiscoveryServiceHandler> <DiscoveryServiceHandler provideListOfList="true" location="https://idp-test.nordu.net(:[0-9]+)?/.+/ClearCache.wayf" jspFile="wayf-ndn.jsp" errorJspFile="wayferror.jsp"> <PluginInstance identifier="DeleteCookiePlugin"/> - <Federation identifier="SWAMID-1.0"/> + <Federation identifier="SWAMID"/> <Federation identifier="Kalmar2"/> </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="SWAMID"/> <Federation identifier="Kalmar2"/> </DiscoveryServiceHandler> |