Mercurial > hg > digilib
changeset 1153:953c72d054dd
use minimal web.xml for Scaler servlet only.
move everything else to web-additional.
| author | robcast |
|---|---|
| date | Fri, 22 Feb 2013 17:14:49 +0100 |
| parents | 6ace0c6fa845 |
| children | 1aca768f2dc3 |
| files | webapp/src/main/webapp/WEB-INF/web-2.3.xml webapp/src/main/webapp/WEB-INF/web-3.0.xml webapp/src/main/webapp/WEB-INF/web-additional.xml |
| diffstat | 3 files changed, 64 insertions(+), 188 deletions(-) [+] |
line wrap: on
line diff
--- a/webapp/src/main/webapp/WEB-INF/web-2.3.xml Fri Feb 22 17:13:19 2013 +0100 +++ b/webapp/src/main/webapp/WEB-INF/web-2.3.xml Fri Feb 22 17:14:49 2013 +0100 @@ -28,24 +28,6 @@ 5 </load-on-startup> </servlet> - <!-- The Texter servlet --> -<!-- <servlet> - <servlet-name> - Texter - </servlet-name> - <servlet-class> - digilib.servlet.Texter - </servlet-class> -</servlet> --> - <!-- The PDFCache servlet --> -<!-- <servlet> - <servlet-name> - PDFCache - </servlet-name> - <servlet-class> - digilib.servlet.PDFCache - </servlet-class> - </servlet> --> <!-- The mapping for the Scaler servlet --> <servlet-mapping> <servlet-name> @@ -63,80 +45,4 @@ /Scaler </url-pattern> </servlet-mapping> - <servlet-mapping> - <servlet-name> - Scaler - </servlet-name> - <url-pattern> - /authenticated/servlet/Scaler/* - </url-pattern> - </servlet-mapping> - <!-- The mapping for the Texter servlet --> -<!-- <servlet-mapping> - <servlet-name> - Texter - </servlet-name> - <url-pattern> - /servlet/Texter/* - </url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name> - Texter - </servlet-name> - <url-pattern> - /authenticated/servlet/Texter/* - </url-pattern> - </servlet-mapping> --> - <!-- The mapping for the Texter servlet --> -<!-- <servlet-mapping> - <servlet-name> - PDFCache - </servlet-name> - <url-pattern> - /servlet/PDFCache/* - </url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name> - PDFCache - </servlet-name> - <url-pattern> - /authenticated/servlet/PDFCache/* - </url-pattern> - </servlet-mapping> --> - <!-- region for authenticated access --> - <security-constraint> - <web-resource-collection> - <web-resource-name> - Authenticated Digilib - </web-resource-name> - <url-pattern> - /authenticated/* - </url-pattern> - </web-resource-collection> - <!-- we need a default user --> -<!-- <auth-constraint> - <role-name> - user - </role-name> - </auth-constraint> --> - </security-constraint> - <login-config> - <!-- - <auth-method>BASIC</auth-method> - <realm-name>digilib</realm-name> - --> - <auth-method> - FORM - </auth-method> - <form-login-config> - <form-login-page> - /digilib-login.html - </form-login-page> - <form-error-page> - /digilib-fail.html - </form-error-page> - </form-login-config> - </login-config> </web-app>
--- a/webapp/src/main/webapp/WEB-INF/web-3.0.xml Fri Feb 22 17:13:19 2013 +0100 +++ b/webapp/src/main/webapp/WEB-INF/web-3.0.xml Fri Feb 22 17:14:49 2013 +0100 @@ -31,24 +31,6 @@ 5 </load-on-startup> </servlet> - <!-- The Texter servlet --> -<!-- <servlet> - <servlet-name> - Texter - </servlet-name> - <servlet-class> - digilib.servlet.Texter - </servlet-class> -</servlet> --> - <!-- The PDFCache servlet --> -<!-- <servlet> - <servlet-name> - PDFCache - </servlet-name> - <servlet-class> - digilib.servlet.PDFCache - </servlet-class> - </servlet> --> <!-- The mapping for the Scaler servlet --> <servlet-mapping> <servlet-name> @@ -66,80 +48,4 @@ /Scaler </url-pattern> </servlet-mapping> - <servlet-mapping> - <servlet-name> - Scaler - </servlet-name> - <url-pattern> - /authenticated/servlet/Scaler/* - </url-pattern> - </servlet-mapping> - <!-- The mapping for the Texter servlet --> -<!-- <servlet-mapping> - <servlet-name> - Texter - </servlet-name> - <url-pattern> - /servlet/Texter/* - </url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name> - Texter - </servlet-name> - <url-pattern> - /authenticated/servlet/Texter/* - </url-pattern> - </servlet-mapping> --> - <!-- The mapping for the PDFCache servlet --> -<!-- <servlet-mapping> - <servlet-name> - PDFCache - </servlet-name> - <url-pattern> - /servlet/PDFCache/* - </url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name> - PDFCache - </servlet-name> - <url-pattern> - /authenticated/servlet/PDFCache/* - </url-pattern> - </servlet-mapping> --> - <!-- region for authenticated access --> - <security-constraint> - <web-resource-collection> - <web-resource-name> - Authenticated Digilib - </web-resource-name> - <url-pattern> - /authenticated/* - </url-pattern> - </web-resource-collection> - <!-- we need a default user --> -<!-- <auth-constraint> - <role-name> - user - </role-name> - </auth-constraint> --> - </security-constraint> - <login-config> - <!-- - <auth-method>BASIC</auth-method> - <realm-name>digilib</realm-name> - --> - <auth-method> - FORM - </auth-method> - <form-login-config> - <form-login-page> - /digilib-login.html - </form-login-page> - <form-error-page> - /digilib-fail.html - </form-error-page> - </form-login-config> - </login-config> </web-app>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webapp/src/main/webapp/WEB-INF/web-additional.xml Fri Feb 22 17:14:49 2013 +0100 @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!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> + <!-- + Additional web.xml snippets for digilib. + Use at your own risk! + --> + + <!-- The Texter servlet --> + <servlet> + <servlet-name>Texter</servlet-name> + <servlet-class>digilib.servlet.Texter</servlet-class> + </servlet> + <!-- The mapping for the Texter servlet --> + <servlet-mapping> + <servlet-name>Texter</servlet-name> + <url-pattern>/servlet/Texter/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>Texter</servlet-name> + <url-pattern>/authenticated/servlet/Texter/*</url-pattern> + </servlet-mapping> + + <!-- The PDFCache servlet --> + <servlet> + <servlet-name>PDFCache</servlet-name> + <servlet-class>digilib.servlet.PDFCache</servlet-class> + </servlet> + <!-- The mapping for the PDFCache servlet --> + <servlet-mapping> + <servlet-name>PDFCache</servlet-name> + <url-pattern>/servlet/PDFCache/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>PDFCache</servlet-name> + <url-pattern>/authenticated/servlet/PDFCache/*</url-pattern> + </servlet-mapping> + + <!-- region for authenticated access --> + <servlet-mapping> + <servlet-name>Scaler</servlet-name> + <url-pattern>/authenticated/servlet/Scaler/*</url-pattern> + </servlet-mapping> --> + <security-constraint> + <web-resource-collection> + <web-resource-name>Authenticated Digilib</web-resource-name> + <url-pattern>/authenticated/*</url-pattern> + </web-resource-collection> + <!-- we need a default user --> + <auth-constraint> + <role-name>user</role-name> + </auth-constraint> + </security-constraint> + <login-config> + <auth-method>BASIC</auth-method> + <realm-name>digilib</realm-name> + <auth-method>FORM</auth-method> + <form-login-config> + <form-login-page>/digilib-login.html</form-login-page> + <form-error-page>/digilib-fail.html</form-error-page> + </form-login-config> + </login-config> + +</web-app>