Mercurial > hg > digilib-old
changeset 888:7e79829579f6 jquery
make servlet 2.3 version the default.
| author | robcast |
|---|---|
| date | Wed, 06 Apr 2011 13:17:25 +0200 (2011-04-06) |
| parents | 5969c1b99f41 |
| children | 65ad22044e13 |
| files | client/digitallibrary/WEB-INF/web-2.3.xml client/digitallibrary/WEB-INF/web-3.0.xml client/digitallibrary/WEB-INF/web.xml |
| diffstat | 3 files changed, 151 insertions(+), 151 deletions(-) [+] |
line wrap: on
line diff
--- a/client/digitallibrary/WEB-INF/web-2.3.xml Wed Apr 06 10:12:33 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,142 +0,0 @@ -<?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> - <!-- General description of your web application --> - <display-name> - digilib - </display-name> - <description> - This is the web frontend of the Digital Document Library. - </description> - <!-- The Intialisation Listener --> - <listener> - <listener-class> - digilib.servlet.Initialiser - </listener-class> - </listener> - <!-- The Scaler servlet --> - <servlet> - <servlet-name> - Scaler - </servlet-name> - <servlet-class> - digilib.servlet.ScalerNoAsync - </servlet-class> - <!-- Load this servlet at server startup time --> - <load-on-startup> - 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> - Scaler - </servlet-name> - <url-pattern> - /servlet/Scaler/* - </url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name> - Scaler - </servlet-name> - <url-pattern> - /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>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/digitallibrary/WEB-INF/web-3.0.xml Wed Apr 06 13:17:25 2011 +0200 @@ -0,0 +1,145 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app + version="3.0" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> + + <!-- General description of your web application --> + <display-name> + digilib + </display-name> + <description> + This is the web frontend of the Digital Document Library. + </description> + <!-- The Intialisation Listener (also configured by annotation) --> + <listener> + <listener-class> + digilib.servlet.Initialiser + </listener-class> + </listener> + <!-- The Scaler servlet (also configured by annotation) --> + <servlet> + <servlet-name> + Scaler + </servlet-name> + <servlet-class> + digilib.servlet.Scaler + </servlet-class> + <!-- Load this servlet at server startup time --> + <load-on-startup> + 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> + Scaler + </servlet-name> + <url-pattern> + /servlet/Scaler/* + </url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name> + Scaler + </servlet-name> + <url-pattern> + /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/client/digitallibrary/WEB-INF/web.xml Wed Apr 06 10:12:33 2011 +0200 +++ b/client/digitallibrary/WEB-INF/web.xml Wed Apr 06 13:17:25 2011 +0200 @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app - version="3.0" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> - +<!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> <!-- General description of your web application --> <display-name> digilib @@ -12,19 +9,19 @@ <description> This is the web frontend of the Digital Document Library. </description> - <!-- The Intialisation Listener (also configured by annotation) --> + <!-- The Intialisation Listener --> <listener> <listener-class> digilib.servlet.Initialiser </listener-class> </listener> - <!-- The Scaler servlet (also configured by annotation) --> + <!-- The Scaler servlet --> <servlet> <servlet-name> Scaler </servlet-name> <servlet-class> - digilib.servlet.Scaler + digilib.servlet.ScalerNoAsync </servlet-class> <!-- Load this servlet at server startup time --> <load-on-startup>