From e5b3e73084bcdfada816b328cff38820ae74cd42 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Mon, 1 Aug 2011 12:31:31 +0200
Subject: merged with trunk

---
 src/main/webapp/WEB-INF/web.xml | 4 ++--
 1 file 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>
-- 
cgit v1.1