summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-08-01 12:31:31 +0200
committerLeif Johansson <leifj@sunet.se>2011-08-01 12:31:31 +0200
commite5b3e73084bcdfada816b328cff38820ae74cd42 (patch)
tree995133485f9eb5c1c703d1be6ad1ae474c8acbfe
parent5033fb3f130daa62a4ee0a7980deffc53bb91cd7 (diff)
merged with trunk
-rw-r--r--src/main/webapp/WEB-INF/web.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index c264d13..366ecc8 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$/wayfconfig.xml</param-value>
+ <param-value>$DS_HOME$/conf/wayfconfig.xml</param-value>
</init-param>
<init-param>
<param-name>WAYFLogConfig</param-name>
- <param-value>$DS_HOME$/logging.xml</param-value>
+ <param-value>$DS_HOME$/conf/logging.xml</param-value>
</init-param>
<init-param>
<param-name>WAYFLogConfigPollFrequency</param-name>