changeset 3:9a472dab7e09

more new documentation
author robcast
date Mon, 12 Dec 2011 20:37:53 +0100
parents 8abbc40d0df5
children 7ad66b7151e0
files website/build-maven.html website/digilib-config.html website/docs.html website/index.html website/tips.html
diffstat 5 files changed, 554 insertions(+), 77 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/website/build-maven.html	Mon Dec 12 20:37:53 2011 +0100
@@ -0,0 +1,170 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>digilib -- Digital Image Library</title>
+</head>
+<body>
+
+  <table border="0" cellspacing="0" cellpadding="10">
+    <tr>
+      <td bgcolor="#a0a0a0">&nbsp;</td>
+      <td>
+        <img src="images/digilib-logo-big.png" align="left" />
+        <h1>
+          <code>digilib</code> -- a versatile image viewing environment for the internet
+        </h1>
+      </td>
+    </tr>
+    <tr>
+      <td bgcolor="#a0a0a0" valign="top" align="right">
+        <p>
+          <b><a href="index.html">Info</a></b>
+        </p>
+        <p>
+          <b><a href="http://developer.berlios.de/projects/digilib/">Project</a></b>
+        </p>
+        <p>
+          <b><a href="http://developer.berlios.de/project/showfiles.php?group_id=251">Download</a></b>
+        </p>
+        <p>
+          <b><a href="docs.html">Docs</a></b>
+          <br />
+          <a href="build-maven.html">Building</a>
+          <br />
+          <a href="digilib-config.html">Configuring</a>
+          <br />
+          <a href="http://developer.berlios.de/docman/?group_id=251">...more</a>
+        </p>
+        <p>
+          <b><a href="tips.html">Tips</a></b>
+        </p>
+        <p>
+          <b><a href="http://hg.berlios.de/repos/digilib">Source</a></b>
+        </p>
+      </td>
+      <td>
+
+        <h1>Building digilib with Maven</h1>
+
+        <p>
+          The easiest way to get the latest and greatest digilib is the <a
+            href="http://maven.apache.org/">Maven</a> build tool. It will download,
+          compile, and install the latest digilib version and all required libraries.
+        </p>
+
+        <h2>What you need</h2>
+        <ul>
+          <li>
+            <a href="http://www.java.com/">Java</a> (1.5 or higher)
+          </li>
+          <li>
+            <a href="http://maven.apache.org/">Maven</a>
+          </li>
+          <li>
+            <a href="http://mercurial.selenic.com/">Mercurial</a>
+          </li>
+          <li>
+            The digilib project file <a
+              href="http://hg.berlios.de/repos/digilib/raw-file/tip/pom.xml">pom.xml</a>
+            (download and save it)
+          </li>
+          <li>
+            A Servlet container like <a href="http://tomcat.apache.org/">Tomcat</a> or <a
+              href="http://www.eclipse.org/jetty/">Jetty</a> to run the web application.
+          </li>
+        </ul>
+
+        <h2>Quick build</h2>
+
+        <p>
+          The fastest way to build the digilib web application is to run
+          <pre>mvn scm:bootstrap -N</pre>
+          in the same directory as the <code>pom.xml</code> file you downloaded.
+        </p>
+        <p>
+          This will create a web application directory <code>digilib-webapp-2.0-SNAPSHOT</code>
+          and a WAR file <code>digilib-webapp-2.0-SNAPSHOT-srv2.war</code> (or similar) in
+          the subdirectory <code>target/checkout/webapp/target/</code>
+        </p>
+        <p>
+          If you want to use the new-and-better Asynchronous Servlet API add <code>-Psrv3</code>
+          to the Maven command line above. You will need Java version 6 and Tomcat version 7 or Jetty version
+          8 or later to use the asynchronous Servlet.
+        </p>
+
+        <h2>Deploying the web application by hand</h2>
+
+        <p>
+          To deploy digilib just copy the web application directory into the <code>webapp</code>
+          directory of the Servlet container.
+        </p>
+
+        <p>
+          Since the URL of your digilib server starts with the name of the web application
+          and the name of the web application is derived from the name of the web
+          application directory <b>please rename the web application directory to <code>digitallibrary</code>
+            before you start
+          </b>
+        </p>
+        <p>
+          Then you should see your digilib running at the URL <a
+            href="http://localhost:8080/digitallibrary/jquery/digilib.html">http://localhost:8080/digitallibrary/jquery/digilib.html</a>
+        </p>
+
+        <h2>Configuring digilib</h2>
+
+        <p>
+          To change the configuration of digilib just edit the file <code>digilib-config.xml</code>
+          in the web application directory (<code>digitallibrary/WEB-INF/digilib-config.xml</code>).
+          Documentation of the configuration options is <a href="digilib-config.html">here</a>.
+        </p>
+
+        <p>
+          You can see a summary of your running digilib configuration at the URL <a
+            href="http://localhost:8080/digitallibrary/server/dlConfig.jsp">http://localhost:8080/digitallibrary/server/dlConfig.jsp</a>
+        </p>
+
+
+        <h2>Developer build</h2>
+
+        <p>If you are developing with digilib it is helpful to check out the source
+          code separately so you can keep it around, modify it or change the configuration
+          before you deploy.</p>
+        <p>
+          To check out the latest source code into the directory <code>digilib</code> run
+        <pre>mvn scm:checkout -N -DcheckoutDirectory=digilib</pre>
+          in the same directory as the <code>pom.xml</code> file you downloaded.
+        </p>
+        <p>
+          The digilib configuration files are now in <code>webapp/src/main/webapp/WEB-INF/</code>
+        </p>
+        <p>
+          To build the resulting source code, change into the <code>digilib</code>
+          directory you checked out above and run
+        <pre>mvn package</pre>
+        This will create a web application directory <code>digilib-webapp-2.0-SNAPSHOT</code>
+        and a WAR file <code>digilib-webapp-2.0-SNAPSHOT-srv2.war</code> (or similar) in
+        the subdirectory <code>webapp/target/</code> .
+        </p>
+        <p>
+          If you want to use the new-and-better Asynchronous Servlet API add <code>-Psrv3</code>
+          to the Maven command line above. You will need Java version 6 and Tomcat version 7 or Jetty version
+          8 or later to use the asynchronous Servlet.
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td style="padding: 0px" align="left">
+        <a href="http://developer.berlios.de"> <img
+          src="http://developer.berlios.de/bslogo.php?group_id=0&type=1" width="124"
+          height="32" border="0" alt="BerliOS Logo" />
+        </a>
+      </td>
+      <td></td>
+    </tr>
+  </table>
+
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/website/digilib-config.html	Mon Dec 12 20:37:53 2011 +0100
@@ -0,0 +1,213 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>digilib -- Digital Image Library</title>
+</head>
+<body>
+  <table border="0" cellspacing="0" cellpadding="10">
+    <tr>
+      <td bgcolor="#a0a0a0">&nbsp;</td>
+      <td>
+        <img src="images/digilib-logo-big.png" align="left" />
+        <h1>
+          <tt>digilib</tt> -- a versatile image viewing environment for the internet
+        </h1>
+      </td>
+    </tr>
+    <tr>
+      <td bgcolor="#a0a0a0" valign="top" align="right">
+        <p>
+          <b><a href="index.html">Info</a> </b>
+        </p>
+        <p>
+          <b><a href="http://developer.berlios.de/projects/digilib/">Project</a> </b>
+        </p>
+        <p>
+          <b><a href="http://developer.berlios.de/project/showfiles.php?group_id=251">Download</a>
+          </b>
+        </p>
+        <p>
+          <b><a href="docs.html">Docs</a></b>
+          <br />
+          <a href="build-maven.html">Building</a>
+          <br />
+          <a href="digilib-config.html">Configuring</a>
+          <br />
+          <a href="http://developer.berlios.de/docman/?group_id=251">...more</a>
+        </p>
+        <p>
+          <b><a href="tips.html">Tips</a> </b>
+        </p>
+        <p>
+          <b><a href="http://hg.berlios.de/repos/digilib">Source</a> </b>
+        </p>
+      </td>
+      <td>
+
+        <h1>Configuring digilib</h1>
+
+        <h2>digilib-config.xml</h2>
+
+        <p>
+          The main configuration for digilib is <code>digilib-config.xml</code> . It's
+          normally in the <code>WEB-INF</code> directory in the webapp. (If you really
+          need another location you can define it in the <code>config-file</code>
+          init-parameter to the servlet)
+        </p>
+
+        <p>In the configuration file you can set several paths and options. The file
+          looks like this:</p>
+
+        <pre>
+&lt;!-- Digilib servlet config file --&gt;
+
+&lt;digilib-config&gt;
+  &lt;!--  Image to be sent to indicate general failure. --&gt;
+  &lt;parameter name=&quot;error-image&quot; value=<b>&quot;/docuserver/images/icons/broken.gif&quot;</b> /&gt;
+
+  &lt;!--  Image to be sent to indicate authorization failure. --&gt;
+  &lt;parameter name=&quot;denied-image&quot; value=<b>&quot;/docuserver/images/icons/alert.red.gif&quot;</b> /&gt;
+
+  &lt;!-- List of directories where images are searched.
+       The authoritative directory with the high-resolution images
+       is first in list. --&gt;
+  &lt;parameter name=&quot;basedir-list&quot; value=<b>&quot;/docuserver/images:/docuserver/scaled/small&quot;</b> /&gt;
+
+  &lt;!-- Java class to use for image operations --&gt;
+  &lt;parameter name=&quot;docuimage-class&quot; value=&quot;digilib.image.JAIDocuImage&quot; /&gt;
+
+  &lt;!-- mimimum amount of scaling done with antialiasing --&gt;
+  &lt;parameter name=&quot;subsample-minimum&quot; value=&quot;2&quot;/&gt;
+  
+  &lt;!-- default interpolation quality (0=worst) --&gt;
+  &lt;parameter name=&quot;default-quality&quot; value=&quot;1&quot;/&gt;
+  
+  &lt;!-- is sending whole image files with mo=file allowed? --&gt;
+  &lt;parameter name=&quot;sendfile-allowed&quot; value=&quot;true&quot; /&gt;
+
+  &lt;!-- the a maximum size of any sent image. (0 means no limit) --&gt;
+  &lt;parameter name=&quot;max-image-size&quot; value=&quot;0&quot; /&gt;
+
+  &lt;!-- number of working threads --&gt;
+  &lt;parameter name=&quot;worker-threads&quot; value=&quot;2&quot; /&gt;
+
+  &lt;!-- number of waiting requests in queue --&gt;
+  &lt;parameter name="max-waiting-threads" value="20" /&gt;
+
+  &lt;!-- Restrict access to authorized users.
+       User authentication and roles are provided by the servlet container 
+       (see tomcat-users.xml).
+       Authorization for resources (directories) is evaluated by the servlet 
+       (see auth-file). --&gt;
+  &lt;parameter name=&quot;use-authorization&quot; value=&quot;true&quot;/&gt;
+
+  &lt;!-- Location of XML file with authorization requirements. --&gt;
+  &lt;parameter name=&quot;auth-file&quot; value=&quot;digilib-auth.xml&quot;/&gt;
+
+  &lt;!-- Part of URL to indicate authenticated access to Tomcat. --&gt;
+  &lt;parameter name=&quot;auth-url-path&quot; value=&quot;authenticated/&quot;/&gt;
+
+  &lt;!-- use mapping of &quot;virtual directories&quot; to real directories on the server --&gt;
+  &lt;parameter name=&quot;use-mapping&quot; value=&quot;false&quot;/&gt;
+  
+  &lt;!-- location of XML mapping file --&gt;
+  &lt;parameter name=&quot;mapping-file&quot; value=&quot;digilib-map.xml&quot;/&gt;
+  
+  &lt;!-- location of logger config file --&gt;
+  &lt;parameter name=&quot;log-config-file&quot; value=&quot;log4j-config.xml&quot;/&gt;
+&lt;/digilib-config&gt;
+</pre>
+
+        <p>
+          You have to adjust the <code>basedir-list</code> parameter to the directories
+          where your images are installed. You need only one directory if you don't
+          provide prescaled low resolution versions of your images. The directory with the
+          high-resolution images must be the first entry in the list.
+        </p>
+
+        <p>You can supply your own icons for the &quot;error&quot; and &quot;access
+          denied&quot; messages by the servlet. Standard images will be used if these
+          parameters are undefined.</p>
+
+        <p>
+          You can specify the Java toolkit implementation with the <code>docuimage-class</code>
+          parameter. The <code>ImageLoaderDocuImage</code> usually gives best performance
+          and works with JDK 1.4 and up.
+        </p>
+
+
+        <h2>digilib-auth.xml</h2>
+
+        <p>
+          The digilib access authorization is defined in the file defined by the <code>auth-file</code>
+          parameter (usually <code>digilib-auth.xml</code> in <code>WEB-INF</code> ).
+        </p>
+
+        <p>
+          The file has two parts <code>diglib-paths</code> and <code>diglib-addresses</code>
+          . It looks like this:
+        </p>
+
+        <pre>
+&lt;auth-config&gt;
+
+  &lt;digilib-paths&gt;
+    &lt;!-- 
+      A user must supply one of the roles under &quot;role&quot;
+      to access the directory &quot;name&quot;.
+      Roles under &quot;role&quot; must be separated by comma only (no spaces).  
+    --&gt;
+    &lt;path name=&quot;histast/eastwood-collection&quot; role=&quot;eastwood-coll&quot; /&gt;
+    &lt;path name=&quot;ptolemaios_geo&quot; role=&quot;ptolemaios-geo&quot; /&gt;
+  &lt;/digilib-paths&gt;
+
+  &lt;digilib-addresses&gt;
+    &lt;!-- 
+      A computer with an ip address that matches &quot;ip&quot;
+      is automatically granted all roles under &quot;role&quot;.
+      The ip address is matched from the left (in full quads).
+      Roles under &quot;role&quot; must be separated by comma only (no spaces). 
+    --&gt;
+    &lt;address ip=&quot;127&quot; role=&quot;local&quot; /&gt;
+    &lt;address ip=&quot;130.92.68&quot; role=&quot;eastwood-coll,ptolemaios-geo&quot; /&gt;
+    &lt;address ip=&quot;130.92.151&quot; role=&quot;ALL&quot; /&gt;
+  &lt;/digilib-addresses&gt;
+
+&lt;/auth-config&gt;
+</pre>
+
+        <p>
+          <code>diglib-paths</code> defines restricted directories and the roles needed
+          for access. The roles are defined with the users in <code>tomcat-users.xml</code>
+          (see above). All subdirectories of the given directories have the same
+          restrictions. All directories not listed here (and not subdirectories of listed
+          directories) are freely accessible.
+        </p>
+
+        <p>
+          <code>diglib-addresses</code> defines hosts or networks of computers that are
+          automatically authenticated without username and password. Hosts can be assigned
+          roles. The special keyword <code>ALL</code> authorizes for everything. If the
+          role assigned to the computer is not sufficient to access a resource the user
+          will be asked for username and password.
+        </p>
+
+
+
+      </td>
+    </tr>
+    <tr>
+      <td style="padding: 0px" align="left">
+        <a href="http://developer.berlios.de"> <img
+          src="http://developer.berlios.de/bslogo.php?group_id=0&type=1" width="124"
+          height="32" border="0" alt="BerliOS Logo" />
+        </a>
+      </td>
+      <td></td>
+    </tr>
+  </table>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/website/docs.html	Mon Dec 12 20:37:53 2011 +0100
@@ -0,0 +1,79 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>digilib -- Digital Image Library</title>
+</head>
+<body>
+
+  <table border="0" cellspacing="0" cellpadding="10">
+    <tr>
+      <td bgcolor="#a0a0a0">&nbsp;</td>
+      <td>
+        <img src="images/digilib-logo-big.png" align="left" />
+        <h1>
+          <code>digilib</code> -- a versatile image viewing environment for the internet
+        </h1>
+      </td>
+    </tr>
+    <tr>
+      <td bgcolor="#a0a0a0" valign="top" align="right">
+        <p>
+          <b><a href="index.html">Info</a></b>
+        </p>
+        <p>
+          <b><a href="http://developer.berlios.de/projects/digilib/">Project</a></b>
+        </p>
+        <p>
+          <b><a href="http://developer.berlios.de/project/showfiles.php?group_id=251">Download</a></b>
+        </p>
+        <p>
+          <b><a href="docs.html">Docs</a></b>
+          <br />
+          <a href="build-maven.html">Building</a>
+          <br />
+          <a href="digilib-config.html">Configuring</a>
+          <br />
+          <a href="http://developer.berlios.de/docman/?group_id=251">...more</a>
+        </p>
+        <p>
+          <b><a href="tips.html">Tips</a></b>
+        </p>
+        <p>
+          <b><a href="http://hg.berlios.de/repos/digilib">Source</a></b>
+        </p>
+      </td>
+      <td>
+
+        <h1>digilib documentation</h1>
+
+        <p>
+          <a href="build-maven.html">Building digilib with Maven</a>
+        </p>
+        <p>
+          <a href="digilib-config.html">Configuring digilib</a>
+        </p>
+        <p>
+          <a href="http://developer.berlios.de/docman/?group_id=251">...more
+            documentation</a> (installing ready-built digilib, digilib web API, etc.)
+        </p>
+        <p>
+          <a href="tips.html">Tips for running digilib</a> (Java memory settings, using
+          prescaled images, etc.)
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td style="padding: 0px" align="left">
+        <a href="http://developer.berlios.de"> <img
+          src="http://developer.berlios.de/bslogo.php?group_id=0&type=1" width="124"
+          height="32" border="0" alt="BerliOS Logo" />
+        </a>
+      </td>
+      <td></td>
+    </tr>
+  </table>
+
+</body>
+</html>
--- a/website/index.html	Fri Dec 09 20:33:24 2011 +0100
+++ b/website/index.html	Mon Dec 12 20:37:53 2011 +0100
@@ -13,8 +13,7 @@
       <td>
         <img src="images/digilib-logo-big.png" align="left" />
         <h1>
-          <tt>digilib</tt>
-          -- a versatile image viewing environment for the internet
+          <tt>digilib</tt> -- a versatile image viewing environment for the internet
         </h1>
       </td>
     </tr>
@@ -30,7 +29,13 @@
           <b><a href="http://developer.berlios.de/project/showfiles.php?group_id=251">Download</a></b>
         </p>
         <p>
-          <b><a href="http://developer.berlios.de/docman/?group_id=251">Docs</a></b>
+          <b><a href="docs.html">Docs</a></b>
+          <br />
+          <a href="build-maven.html">Building</a>
+          <br />
+          <a href="digilib-config.html">Configuring</a>
+          <br />
+          <a href="http://developer.berlios.de/docman/?group_id=251">...more</a>
         </p>
         <p>
           <b><a href="tips.html">Tips</a></b>
@@ -45,6 +50,12 @@
         <h2>News</h2>
 
         <dl>
+          <dt>12.12.2011</dt>
+          <dd>
+            New documentation: <a href="build-maven.html">How to build and install
+              the latest digilib with Maven</a>.
+          </dd>
+
           <dt>25.5.2011</dt>
           <dd>
             Special offer of the day: <a href="/tmp/digilib-tomcat-2.1b1.zip">latest
@@ -59,7 +70,8 @@
             A new File release (1.8.3). Much internal code has been rewritten and cleaned
             up. There is a new PDF-generation Servlet (in beta) that generates PDF files
             from arbitrary images (try
-            /digitallibrary/servlet/PDFCache?fn=path/to/images&amp;pgs=1-3&amp;dh=1000)!<br />
+            /digitallibrary/servlet/PDFCache?fn=path/to/images&amp;pgs=1-3&amp;dh=1000)!
+            <br />
             SVG rendering (which never worked properly) and some other old stuff has been
             removed. Some library dependencies have changed, check your setup when
             upgrading.
@@ -70,15 +82,19 @@
             Source code development moved to a <a
               href="http://hg.berlios.de/repos/digilib">Mercurial repository</a>! See the
             <a href="http://developer.berlios.de/hg/?group_id=251">instructions</a> to
-            access it.<br /> Code of public release versions should be put also in CVS
-            but don't rely on it...
+            access it.
+            <br />
+            Code of public release versions should be put also in CVS but don't rely on
+            it...
           </dd>
 
           <dt>3.9.2009</dt>
           <dd>
             A new File release (1.7.0) and updates to the <a
               href="http://cvs.berlios.de/cgi-bin/viewcvs.cgi/digilib/config/build.xml">Ant
-              build file</a>.<br /> P.S. Please note that <a
+              build file</a>.
+            <br />
+            P.S. Please note that <a
               href="http://cvs.berlios.de/cgi-bin/viewcvs.cgi/digilib/servlet/src/digilib/servlet/Scaler.java?view=log">a
               lot happens</a> in between file releases. Check out from CVS to be up to date.
           </dd>
@@ -92,8 +108,7 @@
 
           <dt>6.12.2005</dt>
           <dd>
-            <tt>digilib</tt>
-            has it's own icon now!
+            <tt>digilib</tt> has it's own icon now!
           </dd>
 
           <dt>22.11.2005</dt>
@@ -102,70 +117,63 @@
 
         <a name="whatis"></a>
         <h2>
-          What is
-          <tt>digilib</tt>
+          What is <tt>digilib</tt>
         </h2>
 
         <ul>
           <li>
-            <tt>digilib</tt>
-            is a web based client/server technology for images. The image content is
-            processed on-the-fly by a Java Servlet on the server side so that only the
-            visible portion of the image is sent to the web browser on the client side.
+            <tt>digilib</tt> is a web based client/server technology for images. The image
+            content is processed on-the-fly by a Java Servlet on the server side so that
+            only the visible portion of the image is sent to the web browser on the client
+            side.
           </li>
           <li>
-            <tt>digilib</tt>
-            supports a wide range of image formats and viewing options on the server side
-            while only requiring an internet browser with javascript and a low bandwidth
-            internet connection on the client side.
+            <tt>digilib</tt> supports a wide range of image formats and viewing options on
+            the server side while only requiring an internet browser with javascript and a
+            low bandwidth internet connection on the client side.
           </li>
           <li>
-            <tt>digilib</tt>
-            enables very detailed work on an image as required by scientists with
-            elaborate zoom features like an option to show images on the screen in their
-            original size.
+            <tt>digilib</tt> enables very detailed work on an image as required by
+            scientists with elaborate zoom features like an option to show images on the
+            screen in their original size.
           </li>
           <li>
-            <tt>digilib</tt>
-            facilitates cooperation of scientists over the internet and novel uses of
-            source material by image annotations and stable references that can be
-            embedded in URLs.
+            <tt>digilib</tt> facilitates cooperation of scientists over the internet and
+            novel uses of source material by image annotations and stable references that
+            can be embedded in URLs.
           </li>
           <li>
-            <tt>digilib</tt>
-            is used in the <a
+            <tt>digilib</tt> is used in the <a
               href="http://penelope.unibe.ch/docuserver/echo/alcatraz/index3.html">ALCATRAZ</a>
             framework of image, text and annotation tools and many other projects.
           </li>
           <li>
-            <tt>digilib</tt>
-            is Open Source Software under the General Public License, jointly developed by
-            the <a href="http://www.mpiwg-berlin.mpg.de">Max-Planck-Insitute for the
-              History of Science</a>, the <a href="http://philoscience.unibe.ch">University
+            <tt>digilib</tt> is Open Source Software under the General Public License,
+            jointly developed by the <a href="http://www.mpiwg-berlin.mpg.de">Max-Planck-Insitute
+              for the History of Science</a>, the <a href="http://philoscience.unibe.ch">University
               of Bern</a> and others.
           </li>
         </ul>
 
         <a name="howtoget"></a>
         <h2>
-          Where can I get
-          <tt>digilib</tt>
+          Where can I get <tt>digilib</tt>
         </h2>
 
         <p>
-          <tt>digilib</tt>
-          source code, binaries and documentation can be found on the <a
+          <tt>digilib</tt> source code, binaries and documentation can be found on the <a
             href="http://developer.berlios.de/projects/digilib/">digilib project pages</a>
           on <a href="http://developer.berlios.de">BerliOS</a>.
         </p>
 
       </td>
     </tr>
-    <tr> 
-      <td style="padding:0px" align="left">
-          <a href="http://developer.berlios.de"> <img
-            src="http://developer.berlios.de/bslogo.php?group_id=0&type=1" width="124"
-            height="32" border="0" alt="BerliOS Logo" /> </a>
+    <tr>
+      <td style="padding: 0px" align="left">
+        <a href="http://developer.berlios.de"> <img
+          src="http://developer.berlios.de/bslogo.php?group_id=0&type=1" width="124"
+          height="32" border="0" alt="BerliOS Logo" />
+        </a>
       </td>
       <td></td>
     </tr>
--- a/website/tips.html	Fri Dec 09 20:33:24 2011 +0100
+++ b/website/tips.html	Mon Dec 12 20:37:53 2011 +0100
@@ -12,36 +12,36 @@
       <td>
         <img src="images/digilib-logo-big.png" align="left" />
         <h1>
-          <tt>digilib</tt>
-          -- a versatile image viewing environment for the internet
+          <tt>digilib</tt> -- a versatile image viewing environment for the internet
         </h1>
       </td>
     </tr>
     <tr>
       <td bgcolor="#a0a0a0" valign="top" align="right">
         <p>
-          <b><a href="index.html">Info</a>
-          </b>
+          <b><a href="index.html">Info</a> </b>
         </p>
         <p>
-          <b><a href="http://developer.berlios.de/projects/digilib/">Project</a>
-          </b>
+          <b><a href="http://developer.berlios.de/projects/digilib/">Project</a> </b>
         </p>
         <p>
           <b><a href="http://developer.berlios.de/project/showfiles.php?group_id=251">Download</a>
           </b>
         </p>
         <p>
-          <b><a href="http://developer.berlios.de/docman/?group_id=251">Docs</a>
-          </b>
+          <b><a href="docs.html">Docs</a></b>
+          <br />
+          <a href="build-maven.html">Building</a>
+          <br />
+          <a href="digilib-config.html">Configuring</a>
+          <br />
+          <a href="http://developer.berlios.de/docman/?group_id=251">...more</a>
         </p>
         <p>
-          <b><a href="tips.html">Tips</a>
-          </b>
+          <b><a href="tips.html">Tips</a> </b>
         </p>
         <p>
-          <b><a href="http://hg.berlios.de/repos/digilib">Source</a>
-          </b>
+          <b><a href="http://hg.berlios.de/repos/digilib">Source</a> </b>
         </p>
       </td>
       <td>
@@ -56,7 +56,7 @@
             <a href="#prescaled_images">Prescaled images</a>
           </li>
           <li>
-            <a href="installing_jai">Installing JAI</a>
+            <a href="#installing_jai">Installing JAI</a>
           </li>
         </ul>
 
@@ -134,47 +134,53 @@
         <h1 id="installing_jai">Installing JAI</h1>
 
         <p>
-          In principle you can install the <a
+          In theory you can install the <a
             href="http://java.sun.com/javase/technologies/desktop/media/jai/"
-            class="external text" rel="nofollow">Java Advanced Imaging</a> JAR files (and
-          native library files if available) in the /WEB-INF/lib/ directory of the digilib
-          web application.
-
+            class="external text" rel="nofollow">Java Advanced Imaging</a> and JAI-ImageIO
+          JAR files <code>jai_core.jar, jai_codec.jar, jai_imageio.jar</code> (and native
+          library files if available) in the <code>/WEB-INF/lib/</code> directory of the
+          digilib web application.
         </p>
-        <p>I found that in some cases digilib stopped reading TIFF files after a
-          period of running. In these cases it helped to install the JAI files directly in
-          the local Java installation (i.e. in the Java's /jre/lib/ext/ directory on
-          linux).</p>
+        <p>But there are classloader issues. Newer versions of Tomcat refuse to load
+          the libraries and I found that in some cases digilib stopped reading TIFF files
+          after a period of running.</p>
+        <p>
+          In these cases it helped to install the JAI files in Tomcats <code>lib/</code>
+          directory or Jettys <code>lib/ext/</code> or globally in the local Java JDK
+          installation (i.e. in the Java's /jre/lib/ext/ directory on linux).
+        </p>
 
 
         <h1 id="mpiwg_setup">Sample setup</h1>
 
-        <p>The current digilib setup at the MPIWG (as of November 2005):</p>
+        <p>The current digilib setup at the MPIWG (as of December 2010):</p>
         <ul>
           <li>
             One frontend server running the lightweight web-multiplexer <a
               href="http://www.apsis.ch/pound/" class="external text" rel="nofollow">pound</a>
-            on port 80 that distributes requests to two servers runnning digilib
+            on port 80 that distributes requests to three servers runnning digilib
           </li>
           <li>
-            the two servers run digilib under <a
-              href="http://tomcat.apache.org/index.html" class="external text"
-              rel="nofollow">Tomcat</a> on port 8080 without Apache
+            the three servers run digilib under <a
+              href="http://www.eclipse.org/jetty/" class="external text"
+              rel="nofollow">Jetty</a> on port 8080 without Apache
             <ul>
-              <li>one server is the same machine as the frontend server (Linux, Dual
+              <li>one server is the frontend server (Linux 32bit, Dual
                 2.4GHz Xeon, 2GB RAM)</li>
-              <li>the other server is a separate, newer machine (Linux, Dual 1.8GHz
+              <li>the other server is a separate, newer machine (Linux 64bit, Dual 1.8GHz
                 Opteron, 2GB RAM)</li>
+              <li>the third server is a separate, newer machine (Linux 32bit, Dual 2.8GHz
+                Xeon, 4GB RAM)</li>
             </ul>
           </li>
           <li>
-            the digilib instances (digilib 1.5.9c as of 22.11.2005) run on Tomcat on Java
-            1.5.0_05 (or 1.4.2_06) with 1GB of <a href="#vm_settings">Java VM memory
-              for digilib</a> (-Xmx1024m) with JAI (1.1.2_01) and JAI-ImageIO (1.0_01) <a
-              href="#installing_jai">installed in the JRE</a>(!)
+            the digilib instances (digilib 2.0b1 as of 12.12.2011) run on Jetty 8.0.4 on Java
+            1.6.0_26 with 1GB of <a href="#vm_settings">Java VM memory
+              for digilib</a> (-Xmx1024m) with JAI (1.1.3) and JAI-ImageIO (1.1) <a
+              href="#installing_jai">installed in the Jetty/lib/ext</a>(!)
           </li>
           <li>both digilib servers access all image files over NFS (over GBit
-            Ethernet) from a central file server (Solaris 8, Sun Fire 480, multiple RAIDs
+            Ethernet) from a central file server (Solaris 10, Sun Fire 240, multiple RAIDs
             on Fibrechannel)</li>
         </ul>
 
@@ -184,7 +190,8 @@
       <td style="padding: 0px" align="left">
         <a href="http://developer.berlios.de"> <img
           src="http://developer.berlios.de/bslogo.php?group_id=0&type=1" width="124"
-          height="32" border="0" alt="BerliOS Logo" /> </a>
+          height="32" border="0" alt="BerliOS Logo" />
+        </a>
       </td>
       <td></td>
     </tr>