summaryrefslogtreecommitdiff
path: root/src/main/webapp/WEB-INF/web.xml
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-08-01 11:30:31 +0200
committerLeif Johansson <leifj@sunet.se>2011-08-01 11:30:31 +0200
commitdcece198527eb3012a081402ad2e117e2136a4a4 (patch)
treeedec9a75960183df676b5f0cf295522314541657 /src/main/webapp/WEB-INF/web.xml
parent3fc853cc1e861f455888a92ff0c9995270d2ba2c (diff)
import trunk@2167
Diffstat (limited to 'src/main/webapp/WEB-INF/web.xml')
-rw-r--r--src/main/webapp/WEB-INF/web.xml14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index c938b16..c264d13 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -12,11 +12,11 @@
<servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfService</servlet-class>
<init-param>
<param-name>WAYFConfigFileLocation</param-name>
- <param-value>$DS_HOME$/conf/wayfconfig.xml</param-value>
+ <param-value>$DS_HOME$/wayfconfig.xml</param-value>
</init-param>
<init-param>
<param-name>WAYFLogConfig</param-name>
- <param-value>$DS_HOME$/conf/logging.xml</param-value>
+ <param-value>$DS_HOME$/logging.xml</param-value>
</init-param>
<init-param>
<param-name>WAYFLogConfigPollFrequency</param-name>
@@ -38,16 +38,6 @@
<url-pattern>*.wayf</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>WAYF</servlet-name>
- <url-pattern>/DS</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>WAYF</servlet-name>
- <url-pattern>*.ds</url-pattern>
- </servlet-mapping>
-
<mime-mapping>
<extension>css</extension>
<mime-type>text/css</mime-type>