From b5c41b83249677bf1dec46de4a7ce97fee55729e Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 3 Nov 2011 10:53:40 +0100
Subject: import 1.1.3
---
src/main/webapp/WEB-INF/tlds/struts-bean.tld | 0
src/main/webapp/WEB-INF/tlds/struts-logic.tld | 0
src/main/webapp/WEB-INF/web.xml | 97 +++++++++++++--------------
3 files changed, 46 insertions(+), 51 deletions(-)
mode change 100644 => 100755 src/main/webapp/WEB-INF/tlds/struts-bean.tld
mode change 100644 => 100755 src/main/webapp/WEB-INF/tlds/struts-logic.tld
mode change 100644 => 100755 src/main/webapp/WEB-INF/web.xml
(limited to 'src/main/webapp/WEB-INF')
diff --git a/src/main/webapp/WEB-INF/tlds/struts-bean.tld b/src/main/webapp/WEB-INF/tlds/struts-bean.tld
old mode 100644
new mode 100755
diff --git a/src/main/webapp/WEB-INF/tlds/struts-logic.tld b/src/main/webapp/WEB-INF/tlds/struts-logic.tld
old mode 100644
new mode 100755
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
old mode 100644
new mode 100755
index c938b16..ef5f00e
--- 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>
--
cgit v1.1