Synched dist-all deployment descriptor with dist-origin.
[java-idp.git] / webApplication / WEB-INF / web.xml
index bd54e31..02fc454 100755 (executable)
@@ -5,6 +5,27 @@
     "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
 
 <web-app>
+       <context-param>
+               <param-name>DBdriver</param-name>
+               <param-value>org.gjt.mm.mysql.Driver</param-value>
+       </context-param>
+       <context-param>
+               <param-name>DBuser</param-name>
+               <param-value>shib</param-value>
+       </context-param>
+       <context-param>
+               <param-name>DBpass</param-name>
+               <param-value>shib</param-value>
+       </context-param>
+       <context-param>
+               <param-name>DBdomain</param-name>
+               <param-value>shib2.internet2.edu</param-value>
+       </context-param>
+       <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>
                          <param-value>https://shib2.internet2.edu/shibboleth-origin/servlet/AA</param-value>
                </init-param>
                <init-param>
-                       <param-name>DBdriver</param-name>
-                       <param-value>org.gjt.mm.mysql.Driver</param-value>
-               </init-param>
-               <init-param>
-                       <param-name>DBuser</param-name>
-                       <param-value>shib</param-value>
-               </init-param>
-               <init-param>
-                       <param-name>DBpass</param-name>
-                       <param-value>shib</param-value>
-               </init-param>
-               <init-param>
-                       <param-name>DBdomain</param-name>
-                       <param-value>shib2.internet2.edu</param-value>
-               </init-param>
-               <init-param>
                        <param-name>KSpath</param-name>
                        <param-value>/WEB-INF/conf/keystore.jks</param-value>
                </init-param>
                    <param-name>arpFactoryMethod</param-name>
                    <param-value>file</param-value>
                </init-param>
-
-               <init-param>
-                   <param-name>arpFactoryData</param-name>
-                   <param-value>/tmp/shib2/</param-value>
-               </init-param>
        </servlet>
        <servlet>
                <servlet-name>WAYF</servlet-name>
                <display-name>Simple servlet for testing WAYF functionality</display-name>
                <servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfTester</servlet-class>
        </servlet>
+       <servlet>
+               <servlet-name>SHIRE</servlet-name>
+               <display-name>Shibboleth SHIRE Component</display-name>
+               <servlet-class>edu.internet2.middleware.shibboleth.shire.ShireServlet</servlet-class>
+       <init-param>
+               <param-name>cookie-name</param-name>
+               <param-value>shib_shib1</param-value>
+       </init-param>
+       <init-param>
+               <param-name>session-dir</param-name>
+               <param-value>/tmp/shiresessions</param-value>
+       </init-param>
+       <init-param>
+               <param-name>ssl-only</param-name>
+               <param-value>true</param-value>
+       </init-param>
+       <init-param>
+               <param-name>check-address</param-name>
+               <param-value>true</param-value>
+       </init-param>
+       <init-param>
+               <param-name>verbose</param-name>
+               <param-value>true</param-value>
+       </init-param>
+       <init-param>
+               <param-name>keystore-path</param-name>
+               <param-value>/WEB-INF/conf/roots.jks</param-value>
+       </init-param>
+       <init-param>
+               <param-name>keystore-alias</param-name>
+               <param-value>internet2</param-value>
+       </init-param>
+       <init-param>
+               <param-name>keystore-password</param-name>
+               <param-value>shibboleth</param-value>
+       </init-param>
+       <init-param>
+               <param-name>registry-uri</param-name>
+               <param-value>http://newman.uts.ohio-state.edu/shibsites.xml</param-value>
+       </init-param>
+       </servlet>
        
      <servlet-mapping>
                <servlet-name>WAYF</servlet-name>
                <servlet-name>AA</servlet-name>
                <url-pattern>/AA</url-pattern>
        </servlet-mapping>
+       <servlet-mapping>
+               <servlet-name>SHIRE</servlet-name>
+               <url-pattern>/SHIRE</url-pattern>
+       </servlet-mapping>
        
        <mime-mapping>
                <extension>css</extension>