More robust config file loading.
[java-idp.git] / webAppConfig / wayf.xml
index c8c9638..54b34ec 100755 (executable)
@@ -6,24 +6,28 @@
 
 <web-app>
        <servlet>
+               <servlet-name>Logging Service</servlet-name>
+               <servlet-class>edu.internet2.middleware.shibboleth.log.LogServ</servlet-class>
+               <init-param>
+                       <param-name>log4jConfigFileLocation</param-name>
+                       <param-value>/WEB-INF/conf/log4j.properties</param-value>
+               </init-param>
+               <load-on-startup>1</load-on-startup>
+       </servlet>
+       <servlet>
                <servlet-name>WAYF</servlet-name>
                <display-name>Shibboleth WAYF Service</display-name>
                <servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfService</servlet-class>
-       </servlet>
-       <servlet>
-               <servlet-name>WAYFTester</servlet-name>
-               <display-name>Simple servlet for testing WAYF functionality</display-name>
-               <servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfTester</servlet-class>
+                <init-param>
+                    <param-name>SiteConfigFileLocation</param-name>
+                    <param-value>/sites.xml</param-value>
+                </init-param>
        </servlet>
       
      <servlet-mapping>
                <servlet-name>WAYF</servlet-name>
                <url-pattern>/WAYF</url-pattern>
        </servlet-mapping>
-       <servlet-mapping>
-               <servlet-name>WAYFTester</servlet-name>
-               <url-pattern>/WAYFTester</url-pattern>
-       </servlet-mapping>
        
        <mime-mapping>
                <extension>css</extension>