Mercurial > hg > digilib

changeset 1658:28df291d4e26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated documentation. Updated build and install instructions to be simpler and hopefully more clear. Updated @funkyfuture's refactored configuration docs (still lots TODO). Added @funkyfuture's server-setup docu to menu. Renamed non-minified digilib-dbg.html to digilib-dev.html
author Robert Casties <r0bcas7@gmail.com>
date Mon, 20 Nov 2017 21:08:35 +0100
parents fb211930d6e8
children 75a74f7045b4 4ad90af7a242
files README.md doc/src/site/markdown/build-maven.md doc/src/site/markdown/deployment.md doc/src/site/markdown/digilib-config.md doc/src/site/markdown/install-digilib.md doc/src/site/markdown/server-setup.md doc/src/site/site.xml webapp/pom.xml webapp/src/main/webapp/jquery/digilib-dbg.html webapp/src/main/webapp/jquery/digilib-dev.html
diffstat 10 files changed, 258 insertions(+), 214 deletions(-) [+]
line wrap: on
line diff
--- a/README.md	Mon Nov 20 17:03:04 2017 +0100
+++ b/README.md	Mon Nov 20 21:08:35 2017 +0100
@@ -28,22 +28,22 @@
 
 ## Where can I get digilib?
 
-`digilib` documentation can be found on the 
-[digilib documentation pages](https://robcast.github.io/digilib/) on GitHub
-or on [SourceForge](https://sourceforge.net/projects/digilib/)
-
 * [Source code](https://github.com/robcast/digilib)
 * [Issue tracker](https://github.com/robcast/digilib/issues)
 * Daily built [WAR files](https://it-dev.mpiwg-berlin.mpg.de/downloads/digilib/daily-build/)
 * Daily built [Javadoc](https://it-dev.mpiwg-berlin.mpg.de/downloads/digilib/daily-build/javadoc/)
 * [Maven repository](http://it-dev.mpiwg-berlin.mpg.de/maven-repo/)
 
+`digilib` documentation can be found on the 
+[digilib documentation pages](https://robcast.github.io/digilib/) on GitHub
+or on [SourceForge](http://digilib.sourceforge.net).
+
 ## How do I run digilib?
 
 Requirements:
 * [git](https://git-scm.com/)
-* [Java JDK](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
-* [Maven](https://maven.apache.org/)
+* [Java JDK](http://www.oracle.com/technetwork/java/javase/downloads/index.html) version 7 or later
+* [Maven](https://maven.apache.org/) version 3 or later
 
 Build:
 1. Clone the digilib repository
@@ -56,8 +56,8 @@
    
 3. build and run the webapp in the embedded Jetty runtime for development
  
-   `mvn jetty:run --projects webapp`
+   `mvn jetty:run-exploded --projects webapp`
    
-   and watch digilib at http://localhost:8080/digilib.html
+   and watch digilib at http://localhost:8080/digilib/digilib.html
 
-or follow the production build instructions in the on https://robcast.github.io/digilib/
+or follow the build and install instructions on the [documentation pages](https://robcast.github.io/digilib/).
--- a/doc/src/site/markdown/build-maven.md	Mon Nov 20 17:03:04 2017 +0100
+++ b/doc/src/site/markdown/build-maven.md	Mon Nov 20 21:08:35 2017 +0100
@@ -1,34 +1,30 @@
 # Building digilib with Maven
 
-The easiest way to get the latest and greatest digilib is the [Maven](http://maven.apache.org/) build tool. 
-It will download, compile, and install the latest digilib version and all required libraries.
+The best way to get the latest and greatest digilib is using the [git](https://git-scm.com/) version control and the [Maven](http://maven.apache.org/) build tool. 
+Git will download the digilib code and Maven will compile, and install the latest digilib version and all required libraries.
 
 ## What you need
 
-* [Java](http://www.java.com/) (1.5 or higher)
+* [git](https://git-scm.com/)
+* [Java JDK](http://www.oracle.com/technetwork/java/javase/downloads/index.html) (7 or higher)
 * [Maven](http://maven.apache.org/)
-* [Mercurial](http://mercurial.selenic.com/)
-* A Servlet container like [Tomcat](http://tomcat.apache.org/) 
-or [Jetty](http://www.eclipse.org/jetty/) to run the web application.
 
-## Quick build
+## Quick developer build and run
 
-The fastest way to build the digilib web application is to download the digilib 
-project file [pom.xml](https://sourceforge.net/p/digilib/code/ci/default/tree/pom.xml?format=raw)
-(download and save it) and run
-	
-	mvn scm:bootstrap -N
-
-in the same directory as the `pom.xml` file.
+1. Clone the digilib repository into a directory `digilib`
+   
+        git clone https://github.com/robcast/digilib.git
+   
+2. Change to the directory
+   
+        cd digilib
+   
+3. build and run the webapp in the embedded Jetty runtime for development
+   
+        mvn jetty:run-exploded --projects webapp
+   
+   and watch your digilib at http://localhost:8080/digilib.html
 
-This will create a web application directory `digilib-webapp-2.2-SNAPSHOT` 
-and a WAR file `digilib-webapp-2.2-SNAPSHOT-srv3.war` (or similar) 
-in the subdirectory `target/checkout/webapp/target/`
-
-Digilib uses the Asynchronous Servlet API (3.0) by default. You will need Java version 6 
-and Tomcat version 7 or Jetty version 8 or later to use it.
-If you want to use the old non-Asynchronous Servlet API (2.3) add `-Pservlet2`
-to the Maven command line above.
 
 ## Developer build
 
@@ -38,31 +34,27 @@
 
 To check out the latest source code into the directory `digilib` run
 	
-	hg clone http://hg.code.sf.net/p/digilib/code digilib
+    git clone https://github.com/robcast/digilib.git
+    
+and change into the repository directory
 
-The digilib configuration files are now in `digilib/webapp/src/main/webapp/WEB-INF/`
+    cd digilib
 
 If you want to update your copy of digilib to the latest version at some time in the future 
 just run
 
-	hg pull
-	hg up
-	
-in the `digilib` directory.
+	git pull
 
-To build the resulting source code, change into the `digilib`
-directory you checked out above and run
+The digilib configuration files are in the sub-directory `webapp/src/main/webapp/WEB-INF/` (see below).
+
+To build the resulting source code run
 
 	mvn package
 
-This will create a web application directory `digilib-webapp-2.2-SNAPSHOT`
-and a WAR file `digilib-webapp-2.2-SNAPSHOT-srv3.war` (or similar) in
+This will create a web application directory `digilib-webapp-2.5-SNAPSHOT`
+and a WAR file `digilib-webapp-2.5-SNAPSHOT-srv3.war` (or similar) in
 the subdirectory `webapp/target/` .
 
-Digilib uses the Asynchronous Servlet API (3.0) by default. You will need Java version 6 
-and Tomcat version 7 or Jetty version 8 or later to use it.
-If you want to use the old non-Asynchronous Servlet API (2.3) add `-Pservlet2`
-to the Maven command line above.
 
 ## Deploying the web application by hand
 
@@ -72,20 +64,32 @@
 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 or the WAR file **please rename the web application directory or WAR file 
-to `digitallibrary` before you start**
+to `digilib` before you start**
 
-Then you should see your digilib running at the URL 
-[http://localhost:8080/digitallibrary/jquery/digilib.html](http://localhost:8080/digitallibrary/jquery/digilib.html)
+Then you should see digilib running at the URL 
+http://localhost:8080/digilib/digilib.html
 
 If you use the unmodified default configuration you should see the digilib logo
 and other sample images from the `sample-images` directory of the web application.
 
+For more detailed documentation see the [deployment instructions](install-digilib.html).
+
 ## Configuring digilib
 
-To change the configuration of digilib just edit the file `digilib-config.xml`
-in the web application directory (`digitallibrary/WEB-INF/digilib-config.xml`).
-Documentation of the configuration options is [here](digilib-config.html).
+To change the configuration of digilib just create and edit the file `digilib-config.xml`
+in the web application WEB-INF directory (`webapp/src/main/webapp/WEB-INF/digilib-config.xml`).
+You can copy and rename the sample file `digilib-config.xml.template` to get some default options to start with.
+Please check the [documentation of the configuration options](digilib-config.html).
 
 You can see a summary of your running digilib configuration at the URL 
-[http://localhost:8080/digitallibrary/server/dlConfig.jsp](http://localhost:8080/digitallibrary/server/dlConfig.jsp)
+http://localhost:8080/digilib/server/dlConfig.jsp
+
+## Additional Maven build options
+
+### servlet2
 
+Digilib uses the Asynchronous Servlet API (3.0) by default. You will need Java version 6 or later 
+and Tomcat version 7 or Jetty version 8 or later to use it.
+If you want to use the old non-Asynchronous Servlet API (2.3) add `-Pservlet2`
+to the Maven command line above.
+
--- a/doc/src/site/markdown/deployment.md	Mon Nov 20 17:03:04 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# Deploying digilib
-
-There are a variety of ways to deploy digilib on different server setups.
-
-## nginx as proxy
-
-This is an example configuration for `nginx` as a proxy for a single instance
-of digilib (listening on port `8080`) that handles transport encryption and
-restricts access to sensitive data to the gateway of a local network
-(`1.2.3.4`).
-
-```nginx
-server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-    server_name digilib.example.org;
-
-    # this certificate chain shall *not* include the root certificate:
-    ssl_certificate /etc/ssl/certs/digilib.example.org.pem;
-    ssl_certificate_key /etc/ssl/private/digilib.example.org.key;
-
-    include /etc/nginx/proxy_params;
-
-    location ~* .*/(dlConfig|dlRequest).jsp$ {
-        allow 1.2.3.4;
-        deny all;
-        proxy_pass http://localhost:8080;
-    }
-
-    location / {
-        proxy_pass http://localhost:8080;
-    }
-}
-```
-
-## Resources
-
-- the [nginx documentation](nginx.org/en/docs/)
--- a/doc/src/site/markdown/digilib-config.md	Mon Nov 20 17:03:04 2017 +0100
+++ b/doc/src/site/markdown/digilib-config.md	Mon Nov 20 21:08:35 2017 +0100
@@ -1,15 +1,15 @@
 # Configuring digilib
 
 The main configuration for *digilib* is the XML file `digilib-config.xml` in the
-`WEB-INF` directory of the webapp or a Java properties file `digilib.properties`
-somewhere in the classpath.
+`WEB-INF` directory of the webapp. Alternatively you can also use a Java properties 
+file `digilib.properties` somewhere in the classpath.
 (If you really need a different location for the XML file you can define it in
 the `config-file` init-parameter to the Servlet. **TODO** add an example)
 
 In the configuration file you can set lots of paths and options. *digilib* uses
 default values for all configuration settings that meet most requirements.
 Hence you have to configure only the settings that you want to change. The
-**`basedir-list`** parameter however is **mandatory** unless you want to serve
+**`basedir-list`** parameter however is **mandatory** unless you only want to serve
 the contributed example images for an evaluation.
 
 All options are defined as `parameter` elements with the attributes `name` and
@@ -62,22 +62,25 @@
 <parameter name="notfound-image" value="img/digilib-notfound.png" />
 ```
 
-This image to sent to indicate an undiscoverable image.
+This image to sent to indicate that the requested image does not exist or could not be read.
 
 ```xml
 <parameter name="use-mapping" value="false" />
 ```
 
 Enables the mapping of 'virtual directories' to actual directories in the
-filesystem.
+filesystem using a mapping file.
 
 ```xml
 <parameter name="mapping-file" value="digilib-map.xml" />
 ```
 
 The location of the mapping file. Refer to
-[this template](https://sourceforge.net/p/digilib/code/ci/default/tree/webapp/src/main/webapp/WEB-INF/digilib-map.xml.template)
-for an example. **TODO** elaborate `link` and `dir` attribute or the whole file structure.
+[digilib-map.xml.template](https://github.com/robcast/digilib/blob/master/webapp/src/main/webapp/WEB-INF/digilib-map.xml.template)
+for an example. 
+
+The file contains `mapping` elements with a `link` attribute containing a 'virtual directory' name that is mapped to the 
+directory given in the `dir` attribute.
 
 
 ### Image processing options
@@ -86,30 +89,31 @@
 <parameter name="default-quality" value="2" />
 ```
 
-The default interpolation quality (`0` is worst).
+The default interpolation quality.
 
-**TODO** document valid value range
+* `0`: do not use interpolation (worst), 
+* `1`: use linear interpolation,
+* `2`: use bilinear interpolation and blur-before-scale (best).
 
 ```xml
 <parameter name="max-image-size" value="0" />
 ```
 
-The maximum size of delivered images, `0` means no limit.
-
-**TODO** mention measurement unit explicitly
+The maximum size of delivered images as pixel area, `40000` means up to 200x200 or 100x400, `0` means no limit.
 
 ```xml
 <parameter name="sendfile-allowed" value="true" />
 ```
 
-Defines whether requests with `mo=file` as parameter are allowed (see
+Defines whether requests with `mo=file` or `mo=rawfile` as parameter are allowed to download files (see
 [Scaler API](scaler-api.html)).
 
 ```xml
 <parameter name="subsample-minimum" value="2.0" />
 ```
 
-Degree of subsampling on image load. **TODO** valid / recommended value range
+Degree of subsampling on image load. This is the minimum factor that is scaled by interpolation and not by 
+subsampling, i.e. by skipping pixels.
 
 
 ### Authentication and authorization
@@ -121,19 +125,14 @@
 <parameter name="auth-file" value="digilib-auth.xml" />
 ```
 
-Configuration file for authentication and authorization.
-
-```xml
-<parameter name="auth-url-path" value="authenticated/" />
-```
-
-This part of the URL indicates authorized access. **TODO** clarify by example?
+Configuration file for authentication and authorization. The format and content of the configuration file
+is determined by the chosen authentication and authorization classes. 
 
 ```xml
 <parameter name="authn-token-cookie" value="id_token" />
 ```
 
-The name of the cookie that holds the authentication token.
+The name of the cookie that holds the authentication token for `digilib.auth.OpenIdAuthnOps`.
 
 ```xml
 <parameter name="authnops-class" value="digilib.auth.IpAuthnOps" />
@@ -151,18 +150,19 @@
 <parameter name="use-authorization" value="false" />
 ```
 
-Enables authorization.
+Enable or disable all authorization. If `use-authorization` is `true` it also needs to be configured
+using `authnops-class` and `authzops-class` and the `auth-file`.
 
 
 ### IIIF API options
 
-The options configure the [IIIF](iiif-api) interface.
+The options configure the IIIF interface. For more information see the [digilib IIIF documentation](iiif-api)
 
 ```xml
 <parameter name="iiif-api-version" value="2.1" />
 ```
 
-The supported IIIF API version. **FIXME**? shouldn't that be set programmatically?
+The IIIF API version for the generated `info.json` information response.  
 
 ```xml
 <parameter name="iiif-info-cors" value="true" />
@@ -186,7 +186,7 @@
 <parameter name="iiif-slash-replacement" value="!" />
 ```
 
-The character that replaces a slash in IIIF requests.
+The character that replaces a slash in the identifier of IIIF requests.
 
 
 ### Threading options
@@ -195,13 +195,13 @@
 <parameter name="max-waiting-threads" value="20" />
 ```
 
-The number of waiting requests in the queue.
+The maximum number of requests waiting in the queue before sending "service unavailable".
 
 ```xml
 <parameter name="worker-threads" value="2" />
 ```
 
-The number of working threads.
+The maximum number of concurrently working threads.
 
 ```xml
 <parameter name="worker-timeout" value="60000" />
@@ -216,23 +216,26 @@
 <parameter name="default-errmsg-type" value="image" />
 ```
 
-Defines how errors are represented. Allowed values are `code`, `image` and
+Defines how errors are presented to the user. Allowed values are `code`, `image` and
 `text`.
 
+* `image` sends an error-image as error code (see `denied-image`, `error-image`, `notfound-image` parameters).
+* `code` sends an HTTP error code, which may result in a broken image display in the browser.
+* `text` sends a plain-text error message, which may result in a broken image display in the browser.
+
 ```xml
 <parameter name="img-diskcache-allowed" value="false" />
 ```
 
-Enables the use of a disk cache for the image toolkit.
-**TODO** elaborate dis-/advantages.
+Enables the use of a disk cache for the image toolkit. Using the disk cache may leak file handles
+and lead to resource issues if digilib runs for a long time.
 
 ```xml
 <parameter name="log-config-file" value="log4j-config.xml" />
 ```
 
-Location of the logging configuration.
-
-**TODO** amend a link to a useful, elaborative resource
+Location of the logging configuration file. The current logger is 
+[Log4J 1.2](https://logging.apache.org/log4j/1.2/manual.html).
 
 
 ### Unknown category
--- a/doc/src/site/markdown/install-digilib.md	Mon Nov 20 17:03:04 2017 +0100
+++ b/doc/src/site/markdown/install-digilib.md	Mon Nov 20 21:08:35 2017 +0100
@@ -2,73 +2,102 @@
 
 To run digilib you need:
 
-* [Java](http://www.java.com/) (1.6 or higher)
+* [Java JDK](http://www.oracle.com/technetwork/java/javase/downloads/index.html) (7 or higher)
 * a Servlet Container like [Tomcat](http://tomcat.apache.org/) (version 7 or 
-higher) or [Jetty](http://www.eclipse.org/jetty/) (version 8 or higher)
+later) or [Jetty](http://www.eclipse.org/jetty/) (version 8 or later)
 * the digilib web application as a WAR file or application directory
 
-## Run the Servlet Container
+## Start the Servlet Container
 
 Install and run the Servlet Container of your choice: 
 [Tomcat](http://tomcat.apache.org/tomcat-7.0-doc/setup.html) or 
 [Jetty](http://wiki.eclipse.org/Jetty/Howto/Run_Jetty).
 
-When it runs you should be able to access the start page on 
+When the Servlet Container runs you should be able to access the start page on 
 <http://localhost:8080/>
 
+## Deploy via WAR file or web application directory?
+
+A web application can be deployed either as a WAR file or a web application directory (aka "exploded web application"). 
+
+The advantage of the WAR file is that it is easy to handle because it is just one file.
+
+The disadvantage of the WAR file is that it is not easy to change the [digilib configuration](digilib-config.html)
+file or any of the HTML or Javascript files because they are hidden in the WAR file.
+
+It is possible to unpack a WAR file into a web application directory to be able to change its contents (see below).
+
+## Where to get a WAR file or web application directory?
+
+The preferred way is to [build your own](build-maven.html) WAR file or web application directory using the digilib sources. 
+In this way you can change the configuration files in the source directory and create a new WAR file
+or web application directory any time you need. 
+Also you get the chance to always use the latest digilib version by updating the source code. 
+
+You can also download a digilib WAR file with a default configuration from the
+[SourceForge download page](https://sourceforge.net/projects/digilib/files/)
+or the latest digilib build from the 
+[daily build page](https://it-dev.mpiwg-berlin.mpg.de/downloads/digilib/daily-build/). 
+The default configuration will only show a set of sample images. If you want to show your own images
+you will need to change the [digilib configuration](digilib-config.html) to point to your image directories. 
+
+
 ## Install a digilib WAR file
 
-1. Download a digilib WAR file of a recent digilib release from the
-SourceForge [Download page](https://sourceforge.net/projects/digilib/files/)
-or the latest digilib build from the 
-[daily build page](https://it-dev.mpiwg-berlin.mpg.de/downloads/digilib/daily-build/).
+1. Get a digilib WAR file.
 2. Rename the WAR file to `digilib.war`.
-3. Deploy the WAR file, i.e. drop it into the `webapps` directory of your 
+3. Deploy the WAR file by copying it into the `webapps` directory of your 
 Servlet Container.
 4. Restart your Servlet Container (this may not be necessary).
 5. Access your digilib instance at <http://localhost:8080/digilib/digilib.html>.
 
 You will now be able to see the sample images provided with the digilib 
-installation.
+installation in the default configuration yor your own images 
+if you have updated the [configuration](digilib-config.html).
 
-If you want to use digilib to show your own images you have to change the
-configuration file [digilib-config.xml](digilib-config.html) **inside** the
-web application. This is hard to do with a WAR file so its better to
-deploy digilib as a web application directory.
+In digilib you can view images by providing the directory and file 
+name as the `fn` parameter to `digilib.html`, e.g. if your file is called 
+`ruler.jpg` and it is in the base directory you can now access the URL
+
+<http://localhost:8080/digilib/digilib.html?fn=ruler>
+
+Read more about the layout of image files and directories 
+[here](image-directories.html).
+
 
 ## Install digilib as a web application directory
 
-Unpack the WAR file into a directory called `digilib` using 
+1. Get a digilib web application directory.
+2. Rename the WAR file to `digilib.war`.
+3. Deploy the WAR file by copying it into the `webapps` directory of your 
+Servlet Container.
+4. Restart your Servlet Container (this may not be necessary).
+5. Access your digilib instance at <http://localhost:8080/digilib/digilib.html>
+
+You will now be able to see the sample images provided with the digilib 
+installation in the default configuration yor your own images 
+if you have updated the [configuration](digilib-config.html).
+
+In digilib you can view images by providing the directory and file 
+name as the `fn` parameter to `digilib.html`, e.g. if your file is called 
+`ruler.jpg` and it is in the base directory you can now access the URL
+
+<http://localhost:8080/digilib/digilib.html?fn=ruler>
+
+Read more about the layout of image files and directories 
+[here](image-directories.html).
+
+
+## Unpack a WAR file into a web application directory
+
+You can unpack the WAR file into a directory called `digilib` using 
 an unzip tool or the `jar -xf` Java command. 
 
 Alternatively you can look into the `webapps` directory of your Servlet 
 Container (when its not running) to see if it created an unpacked web 
-application directory called `digilib`.
-
-Alternatively you can build your own version of digilib as documented
-[here](build-maven.html).
-
-Then:
+application directory called `digilib`. Then:
 
 1. Make sure that your Servlet Container is not running and remove any
 `digilib.war` files from the `webapps` directory.
 2. Copy your `digilib` directory into the `webapps` directory of the
 Servlet Container.
-3. Edit the `digilib-config.xml` file in the `WEB-INF` subdirectory of the
-`digilib` directory and adjust the `basedir-list` parameter to point to
-the directory with your image files [according to the 
-documentation](digilib-config.html). If there is no file `digilib-config.xml`
-you can either create a new file or rename the sample file 
-`digilib-config.xml.template` to `digilib-config.xml` and edit it.
-4. Start your Servlet Container.
-5. Access your digilib instance at <http://localhost:8080/digilib/digilib.html>
-
-You can now view your own images in digilib by providing the directory and file 
-name as the `fn` parameter to `digilib.html`, e.g. if your file is called 
-`flower.jpg` and it is in a subdirectory of the base directory called 
-`digilib-test` you can now access the URL
-
-<http://localhost:8080/digilib/digilib.html?fn=digilib-test/flower>
-
-Read more about the layout of image files and directories 
-[here](image-directories.html).
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/src/site/markdown/server-setup.md	Mon Nov 20 21:08:35 2017 +0100
@@ -0,0 +1,40 @@
+# Server setups for digilib
+
+There are a variety of ways to deploy digilib on different server configurations for production sites. 
+
+Here are some examples.
+
+## nginx as proxy
+
+This is an example configuration for `nginx` as a proxy for a single instance
+of digilib (listening on port `8080`) that handles transport encryption and
+restricts access to sensitive data to the gateway of a local network
+(`1.2.3.4`).
+
+```nginx
+server {
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+    server_name digilib.example.org;
+
+    # this certificate chain shall *not* include the root certificate:
+    ssl_certificate /etc/ssl/certs/digilib.example.org.pem;
+    ssl_certificate_key /etc/ssl/private/digilib.example.org.key;
+
+    include /etc/nginx/proxy_params;
+
+    location ~* .*/(dlConfig|dlRequest).jsp$ {
+        allow 1.2.3.4;
+        deny all;
+        proxy_pass http://localhost:8080;
+    }
+
+    location / {
+        proxy_pass http://localhost:8080;
+    }
+}
+```
+
+## Resources
+
+- the [nginx documentation](nginx.org/en/docs/)
--- a/doc/src/site/site.xml	Mon Nov 20 17:03:04 2017 +0100
+++ b/doc/src/site/site.xml	Mon Nov 20 21:08:35 2017 +0100
@@ -29,8 +29,9 @@
       <item name="Ancient history" href="history.html"/>
     </menu>
     <menu name="Installation">
+      <item name="Building digilib" href="build-maven.html"/>
       <item name="Installing digilib" href="install-digilib.html"/>
-      <item name="Building digilib" href="build-maven.html"/>
+      <item name="Server setups" href="server-setups.html"/>
     </menu>
     <menu name="Configuration">
       <item name="Configuring digilib" href="digilib-config.html"/>
--- a/webapp/pom.xml	Mon Nov 20 17:03:04 2017 +0100
+++ b/webapp/pom.xml	Mon Nov 20 21:08:35 2017 +0100
@@ -197,6 +197,11 @@
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
                 <version>9.2.22.v20170606</version>
+                <configuration>
+                    <webApp>
+                        <contextPath>/digilib</contextPath>
+                    </webApp>
+                </configuration>
             </plugin>
 		</plugins>
 	</build>
--- a/webapp/src/main/webapp/jquery/digilib-dbg.html	Mon Nov 20 17:03:04 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<!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" />
-        <meta name="viewport" content="initial-scale=1.0"/>
-        <title>Digilib jQuery: fullscreen</title>
-
-        <style type="text/css">
-            body {
-                 background: silver;
-            }
-        </style>
-
-        <script type="text/javascript" src="jquery.js"></script>
-        <script type="text/javascript" src="jquery.cookie.js"></script>
-        <script type="text/javascript" src="jquery.digilib.js"></script>
-        <script type="text/javascript" src="jquery.digilib.geometry.js"></script>
-        <script type="text/javascript" src="jquery.digilib.arrows.js"></script>
-        <script type="text/javascript" src="jquery.range.js"></script>
-        <link rel="stylesheet" type="text/css" href="jquery.range.css" />
-        <script type="text/javascript" src="jquery.digilib.buttons.js"></script>
-        <script type="text/javascript" src="jquery.digilib.dialogs.js"></script>
-        <script type="text/javascript" src="jquery.digilib.sliders.js"></script>
-        <script type="text/javascript" src="jquery.digilib.birdseye.js"></script>
-        <script type="text/javascript" src="jquery.digilib.marks.js"></script>
-        <script type="text/javascript" src="jquery.digilib.regions.js"></script>
-        <link rel="stylesheet" type="text/css" href="jquery.digilib.css" />
-        <link rel="stylesheet" type="text/css" href="jquery.digilib.buttons-full-32-sprite.css" />
-
-        <script type="text/javascript">
-            $(document).ready(function(){
-                var opts = {
-                    interactionMode : 'fullscreen',
-                    showRegionNumbers : true
-                    };
-                var $div = $('div#digilib');
-                $div.digilib(opts);
-            });
-
-        </script>
-    </head>
-
-    <body>
-        <div id="digilib">
-            <p>digilib doesn't work! Please switch on Javascript or notify the server administrator!</p>
-            <img src="http://digilib.sourceforge.net/images/digilib-logo-big.png" />
-        </div>
-    </body>
-</html>
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/webapp/src/main/webapp/jquery/digilib-dev.html	Mon Nov 20 21:08:35 2017 +0100
@@ -0,0 +1,50 @@
+<!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" />
+        <meta name="viewport" content="initial-scale=1.0"/>
+        <title>Digilib jQuery: fullscreen</title>
+
+        <style type="text/css">
+            body {
+                 background: silver;
+            }
+        </style>
+
+        <script type="text/javascript" src="jquery.js"></script>
+        <script type="text/javascript" src="jquery.cookie.js"></script>
+        <script type="text/javascript" src="jquery.digilib.js"></script>
+        <script type="text/javascript" src="jquery.digilib.geometry.js"></script>
+        <script type="text/javascript" src="jquery.digilib.arrows.js"></script>
+        <script type="text/javascript" src="jquery.range.js"></script>
+        <link rel="stylesheet" type="text/css" href="jquery.range.css" />
+        <script type="text/javascript" src="jquery.digilib.buttons.js"></script>
+        <script type="text/javascript" src="jquery.digilib.dialogs.js"></script>
+        <script type="text/javascript" src="jquery.digilib.sliders.js"></script>
+        <script type="text/javascript" src="jquery.digilib.birdseye.js"></script>
+        <script type="text/javascript" src="jquery.digilib.marks.js"></script>
+        <script type="text/javascript" src="jquery.digilib.regions.js"></script>
+        <link rel="stylesheet" type="text/css" href="jquery.digilib.css" />
+        <link rel="stylesheet" type="text/css" href="jquery.digilib.buttons-full-32-sprite.css" />
+
+        <script type="text/javascript">
+            $(document).ready(function(){
+                var opts = {
+                    interactionMode : 'fullscreen',
+                    showRegionNumbers : true
+                    };
+                var $div = $('div#digilib');
+                $div.digilib(opts);
+            });
+
+        </script>
+    </head>
+
+    <body>
+        <div id="digilib">
+            <p>digilib doesn't work! Please switch on Javascript or notify the server administrator!</p>
+            <img src="http://digilib.sourceforge.net/images/digilib-logo-big.png" />
+        </div>
+    </body>
+</html>
+