diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-11-03 10:53:40 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-11-03 10:53:40 +0100 |
| commit | b5c41b83249677bf1dec46de4a7ce97fee55729e (patch) | |
| tree | 5e894d0a4b132f41a38a7004e8f65d40dcf037be /src/main/webapp/WEB-INF | |
| parent | 0a90384a9c7d840e88d9636271e8393a514647a0 (diff) | |
import 1.1.31.1.3
Diffstat (limited to 'src/main/webapp/WEB-INF')
| -rwxr-xr-x[-rw-r--r--] | src/main/webapp/WEB-INF/tlds/struts-bean.tld | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/main/webapp/WEB-INF/tlds/struts-logic.tld | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/main/webapp/WEB-INF/web.xml | 97 |
3 files changed, 46 insertions, 51 deletions
diff --git a/src/main/webapp/WEB-INF/tlds/struts-bean.tld b/src/main/webapp/WEB-INF/tlds/struts-bean.tld index 7e95a46..7e95a46 100644..100755 --- a/src/main/webapp/WEB-INF/tlds/struts-bean.tld +++ b/src/main/webapp/WEB-INF/tlds/struts-bean.tld diff --git a/src/main/webapp/WEB-INF/tlds/struts-logic.tld b/src/main/webapp/WEB-INF/tlds/struts-logic.tld index fe638ae..fe638ae 100644..100755 --- a/src/main/webapp/WEB-INF/tlds/struts-logic.tld +++ b/src/main/webapp/WEB-INF/tlds/struts-logic.tld diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index c938b16..ef5f00e 100644..100755 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,55 +1,50 @@ -<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
- 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>WAYF</servlet-name>
- <display-name>Shibboleth WAYF Service</display-name>
- <servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfService</servlet-class>
- <init-param>
- <param-name>WAYFConfigFileLocation</param-name>
- <param-value>$DS_HOME$/conf/wayfconfig.xml</param-value>
- </init-param>
- <init-param>
- <param-name>WAYFLogConfig</param-name>
- <param-value>$DS_HOME$/conf/logging.xml</param-value>
+<?xml version="1.0" encoding="UTF-8"?> +<web-app> + + <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>WAYFConfigFileLocation</param-name> + <param-value>$DS_HOME$/conf/wayfconfig.xml</param-value> + </init-param> + <init-param> + <param-name>WAYFLogConfig</param-name> + <param-value>$DS_HOME$/conf/logging.xml</param-value> </init-param> <init-param> <param-name>WAYFLogConfigPollFrequency</param-name> <param-value>300000</param-value> - </init-param>
- </servlet>
-
-<!-- We specify two mappings - old style http:/host/shibboleth-wayf/WAYF/ and the new style
- whereby the precise name influences the behavior. See the configuration file for
- examples -->
-
- <servlet-mapping>
- <servlet-name>WAYF</servlet-name>
- <url-pattern>/WAYF</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>WAYF</servlet-name>
- <url-pattern>*.wayf</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>WAYF</servlet-name>
- <url-pattern>/DS</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>WAYF</servlet-name>
- <url-pattern>*.ds</url-pattern>
- </servlet-mapping>
-
- <mime-mapping>
- <extension>css</extension>
- <mime-type>text/css</mime-type>
- </mime-mapping>
-</web-app>
+ </init-param> + </servlet> + +<!-- We specify two mappings - old style http:/host/shibboleth-wayf/WAYF/ and the new style + whereby the precise name influences the behavior. See the configuration file for + examples --> + + <servlet-mapping> + <servlet-name>WAYF</servlet-name> + <url-pattern>/WAYF</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>WAYF</servlet-name> + <url-pattern>*.wayf</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>WAYF</servlet-name> + <url-pattern>/DS</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>WAYF</servlet-name> + <url-pattern>*.ds</url-pattern> + </servlet-mapping> + + <mime-mapping> + <extension>css</extension> + <mime-type>text/css</mime-type> + </mime-mapping> +</web-app> |