Add updated IdP configuration elements
[java-idp.git] / webAppConfig / all.xml
index abc2bc3..d88cbed 100755 (executable)
 <?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>
-       <context-param>
-               <param-name>repository</param-name>
-               <param-value>MEMORY</param-value>
-       </context-param>
-       
-       <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>
+
+       <listener> 
+               <listener-class>edu.internet2.middleware.shibboleth.log.LoggingContextListener</listener-class> 
+       </listener>
+
        <servlet>
                <servlet-name>HS</servlet-name>
                <display-name>Shibboleth Handle Service</display-name>
                <servlet-class>edu.internet2.middleware.shibboleth.hs.HandleServlet</servlet-class>
-               <init-param>
-                       <param-name>domain</param-name>
-                       <param-value>shibdev.edu</param-value>
-               </init-param>
-               <init-param>
-                       <param-name>HSname</param-name>
-                       <param-value>shib2.internet2.edu</param-value>
-               </init-param>
-               <init-param>
-                       <param-name>ticket</param-name>
-                       <param-value>1400000</param-value>
-               </init-param>
-               <init-param>
-                         <param-name>AAurl</param-name>
-                         <param-value>https://shib2.internet2.edu/shibboleth-origin/servlet/AA</param-value>
-               </init-param>
-               <init-param>
-                       <param-name>KSpath</param-name>
-                       <param-value>/WEB-INF/conf/keystore.jks</param-value>
-               </init-param>
-               <init-param>
-                       <param-name>KSpass</param-name>
-                       <param-value>shibhs</param-value>
-               </init-param>
-               <init-param>
-                       <param-name>KSkeyalias</param-name>
-                       <param-value>shibhs</param-value>
-               </init-param>
-               <init-param>
-                       <param-name>KSkeypass</param-name>
-                       <param-value>shibhs</param-value>
-               </init-param>
-               <init-param>
-                       <param-name>certalias</param-name>
-                       <param-value>shibhs</param-value>
-               </init-param>
-                <init-param>
-                        <param-name>username</param-name>
-                        <param-value>REMOTE_USER</param-value>
-                </init-param>
        </servlet>
        <servlet>
                <servlet-name>AA</servlet-name>
                <display-name>Shibboleth Attribute Authority</display-name>
                <servlet-class>edu.internet2.middleware.shibboleth.aa.AAServlet</servlet-class>
-               
-               <init-param>
-                   <param-name>domain</param-name>
-                   <param-value>shib2.internet2.edu</param-value>
-               </init-param>
-
-               <init-param>
-                   <param-name>dirUrl</param-name>
-                   <param-value>ldap://shib2.internet2.edu/ou=People,dc=internet2,dc=edu</param-value>
-               </init-param>
-
-               <init-param>
-                   <param-name>ldapUserDnPhrase</param-name>
-                   <param-value>uid=</param-value>
-               </init-param>
-
-               <init-param>
-                   <param-name>ctxFactoryClass</param-name>
-                   <param-value>edu.internet2.middleware.shibboleth.aaLocal.EchoCtxFactory</param-value>
-               </init-param>
        </servlet>
+
        <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>
-     <servlet-mapping>
+       <servlet-mapping>
                <servlet-name>HS</servlet-name>
                <url-pattern>/HS</url-pattern>
        </servlet-mapping>
                <servlet-name>AA</servlet-name>
                <url-pattern>/AA</url-pattern>
        </servlet-mapping>
-       
+
        <mime-mapping>
                <extension>css</extension>
                <mime-type>text/css</mime-type>