# HG changeset patch
# User robcast
# Date 1030447726 -7200
# Node ID 2d8ed5252eb04373ce52be78836886d882db95cc
# Parent  be2a8a672344a1da9481f657fb7b154343706f82
Made web.xml nicer. (ROC)

diff -r be2a8a672344 -r 2d8ed5252eb0 client/digitallibrary/WEB-INF/web.xml
--- a/client/digitallibrary/WEB-INF/web.xml	Tue Aug 27 12:33:30 2002 +0200
+++ b/client/digitallibrary/WEB-INF/web.xml	Tue Aug 27 13:28:46 2002 +0200
@@ -3,81 +3,121 @@
     "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 <web-app>
-
-
     <!-- General description of your web application -->
-
-    <display-name>Docuserver</display-name>
+    <display-name>
+        digilib
+    </display-name>
     <description>
-      This is the web frontend of Docuserver.
+        This is the web frontend of the Digital Document Library.
     </description>
-
-
+    <!-- The Scaler servlet -->
     <servlet>
-      <servlet-name>Scaler</servlet-name>
-      <description>
-	The servlet to scale the digilib images.
-      </description>
-      <servlet-class>digilib.servlet.Scaler</servlet-class>
-      <!-- parameters to the servlet -->
-      <init-param>
-        <param-name>config-file</param-name>
-	<param-value>
-	  /docuserver/www/digitallibrary/WEB-INF/digilib-config.xml
-	</param-value>
-      </init-param>
-      <!-- Load this servlet at server startup time -->
-      <load-on-startup>5</load-on-startup>
+        <servlet-name>
+            Scaler
+        </servlet-name>
+        <description>
+            The servlet to scale the digilib images.
+        </description>
+        <servlet-class>
+            digilib.servlet.Scaler
+        </servlet-class>
+        <!-- parameters to the servlet -->
+        <init-param>
+            <param-name>
+                config-file
+            </param-name>
+            <param-value>
+                /docuserver/www/digitallibrary/WEB-INF/digilib-config.xml
+            </param-value>
+        </init-param>
+        <!-- Load this servlet at server startup time -->
+        <load-on-startup>
+            5
+        </load-on-startup>
+    </servlet>
+  
+    <!-- We want to finger around with the default JSP servlet... -->
+    <servlet>
+        <servlet-name>
+            doc-jsp
+        </servlet-name>
+        <servlet-class>
+            org.apache.jasper.servlet.JspServlet
+        </servlet-class>
+        <!-- parameters to the JSP servlet -->
+        <init-param>
+            <param-name>
+                logVerbosityLevel
+            </param-name>
+            <param-value>
+                WARNING
+            </param-value>
+        </init-param>
+        <init-param>
+            <param-name>
+                config-file
+            </param-name>
+            <param-value>
+                /docuserver/www/digitallibrary/WEB-INF/digilib-config.xml
+            </param-value>
+        </init-param>
+        <load-on-startup>
+            3
+        </load-on-startup>
     </servlet>
 
-  <!-- We want to finger around with the default JSP servlet... -->
-  <servlet>
-    <servlet-name>doc-jsp</servlet-name>
-    <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-    <init-param>
-      <param-name>logVerbosityLevel</param-name>
-      <param-value>WARNING</param-value>
-    </init-param>
-      <!-- parameters to the servlet -->
-      <init-param>
-        <param-name>config-file</param-name>
-	<param-value>
-	  /docuserver/www/digitallibrary/WEB-INF/digilib-config.xml
-	</param-value>
-      </init-param>
-    <load-on-startup>3</load-on-startup>
-  </servlet>
+    <!-- The mapping for the Scaler servlet -->
+    <servlet-mapping>
+        <servlet-name>
+            Scaler
+        </servlet-name>
+        <url-pattern>
+            /servlet/Scaler/*
+        </url-pattern>
+    </servlet-mapping>
 
-
-  <!-- The mapping for the JSP servlet -->
-  <servlet-mapping>
-    <servlet-name>doc-jsp</servlet-name>
-    <url-pattern>*.jsp</url-pattern>
-  </servlet-mapping>
-
+    <!-- The mapping for the JSP servlet -->
+    <servlet-mapping>
+        <servlet-name>
+            doc-jsp
+        </servlet-name>
+        <url-pattern>
+            *.jsp
+        </url-pattern>
+    </servlet-mapping>
 
-  <!-- region for authenticated access -->
+    <!-- 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>
-      <auth-constraint>
-        <role-name>user</role-name>
-      </auth-constraint>
-   </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>
-
+        <!--
+        <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>