Configure logging with <Logging> element in origin.xml.
[java-idp.git] / webAppConfig / wayf.xml
index 77df8d3..03234fb 100755 (executable)
@@ -1,35 +1,29 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-    "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 <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>/conf/log4j.properties</param-value>
-               </init-param>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
-       
+       <listener> 
+               <listener-class>edu.internet2.middleware.shibboleth.log.LoggingContextListener</listener-class> 
+       </listener>
+
        <servlet>
                <servlet-name>WAYF</servlet-name>
                <display-name>Shibboleth WAYF Service</display-name>
                <servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfService</servlet-class>
-                <init-param>
-                    <param-name>SiteConfigFileLocation</param-name>
-                    <param-value>/sites.xml</param-value>
-                </init-param>
+               <init-param>
+                       <param-name>SiteConfigFileLocation</param-name>
+                       <param-value>/conf/sites.xml</param-value>
+               </init-param>
        </servlet>
-       
-     <servlet-mapping>
+
+       <servlet-mapping>
                <servlet-name>WAYF</servlet-name>
                <url-pattern>/WAYF</url-pattern>
        </servlet-mapping>
-       
+
        <mime-mapping>
                <extension>css</extension>
                <mime-type>text/css</mime-type>