# HG changeset patch # User robcast # Date 1279118202 -7200 # Node ID 2efb4b85a8aa33e604639060ca3e4f1b48d53e49 # Parent 705303c6d8266a0413b0c53aaf4fb251f49be828 cleaning old stuff and CVS cruft. diff -r 705303c6d826 -r 2efb4b85a8aa CVSROOT/checkoutlist --- a/CVSROOT/checkoutlist Wed Jul 14 13:29:56 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -# The "checkoutlist" file is used to support additional version controlled -# administrative files in $CVSROOT/CVSROOT, such as template files. -# -# The first entry on a line is a filename which will be checked out from -# the corresponding RCS file in the $CVSROOT/CVSROOT directory. -# The remainder of the line is an error message to use if the file cannot -# be checked out. -# -# File format: -# -# []

-# -# comment lines begin with '#' diff -r 705303c6d826 -r 2efb4b85a8aa CVSROOT/commitinfo --- a/CVSROOT/commitinfo Wed Jul 14 13:29:56 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -# The "commitinfo" file is used to control pre-commit checks. -# The filter on the right is invoked with the repository and a list -# of files to check. A non-zero exit of the filter program will -# cause the commit to be aborted. -# -# The first entry on a line is a regular expression which is tested -# against the directory that the change is being committed to, relative -# to the $CVSROOT. For the first match that is found, then the remainder -# of the line is the name of the filter to run. -# -# If the repository name does not match any of the regular expressions in this -# file, the "DEFAULT" line is used, if it is specified. -# -# If the name "ALL" appears as a regular expression it is always used -# in addition to the first matching regex or "DEFAULT". diff -r 705303c6d826 -r 2efb4b85a8aa CVSROOT/config --- a/CVSROOT/config Wed Jul 14 13:29:56 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -# Set this to "no" if pserver shouldn't check system users/passwords -#SystemAuth=no - -# Put CVS lock files in this directory rather than directly in the repository. -#LockDir=/var/lock/cvs - -# Set `TopLevelAdmin' to `yes' to create a CVS directory at the top -# level of the new working directory when using the `cvs checkout' -# command. -#TopLevelAdmin=no - -# Set `LogHistory' to `all' or `TOFEWGCMAR' to log all transactions to the -# history file, or a subset as needed (ie `TMAR' logs all write operations) -#LogHistory=TOFEWGCMAR diff -r 705303c6d826 -r 2efb4b85a8aa CVSROOT/cvswrappers --- a/CVSROOT/cvswrappers Wed Jul 14 13:29:56 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -# This file affects handling of files based on their names. -# -# The -t/-f options allow one to treat directories of files -# as a single file, or to transform a file in other ways on -# its way in and out of CVS. -# -# The -m option specifies whether CVS attempts to merge files. -# -# The -k option specifies keyword expansion (e.g. -kb for binary). -# -# Format of wrapper file ($CVSROOT/CVSROOT/cvswrappers or .cvswrappers) -# -# wildcard [option value][option value]... -# -# where option is one of -# -f from cvs filter value: path to filter -# -t to cvs filter value: path to filter -# -m update methodology value: MERGE or COPY -# -k expansion mode value: b, o, kkv, &c -# -# and value is a single-quote delimited value. -# For example: -#*.gif -k 'b' diff -r 705303c6d826 -r 2efb4b85a8aa CVSROOT/editinfo --- a/CVSROOT/editinfo Wed Jul 14 13:29:56 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -# The "editinfo" file is used to allow verification of logging -# information. It works best when a template (as specified in the -# rcsinfo file) is provided for the logging procedure. Given a -# template with locations for, a bug-id number, a list of people who -# reviewed the code before it can be checked in, and an external -# process to catalog the differences that were code reviewed, the -# following test can be applied to the code: -# -# Making sure that the entered bug-id number is correct. -# Validating that the code that was reviewed is indeed the code being -# checked in (using the bug-id number or a seperate review -# number to identify this particular code set.). -# -# If any of the above test failed, then the commit would be aborted. -# -# Actions such as mailing a copy of the report to each reviewer are -# better handled by an entry in the loginfo file. -# -# One thing that should be noted is the the ALL keyword is not -# supported. There can be only one entry that matches a given -# repository. diff -r 705303c6d826 -r 2efb4b85a8aa CVSROOT/loginfo --- a/CVSROOT/loginfo Wed Jul 14 13:29:56 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -# The "loginfo" file controls where "cvs commit" log information -# is sent. The first entry on a line is a regular expression which must match -# the directory that the change is being made to, relative to the -# $CVSROOT. If a match is found, then the remainder of the line is a filter -# program that should expect log information on its standard input. -# -# If the repository name does not match any of the regular expressions in this -# file, the "DEFAULT" line is used, if it is specified. -# -# If the name ALL appears as a regular expression it is always used -# in addition to the first matching regex or DEFAULT. -# -# You may specify a format string as part of the -# filter. The string is composed of a `%' followed -# by a single format character, or followed by a set of format -# characters surrounded by `{' and `}' as separators. The format -# characters are: -# -# s = file name -# V = old version number (pre-checkin) -# v = new version number (post-checkin) -# -# For example: -#DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog -# or -#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog -# -ALL /usr/local/bin/log.pl %s -f /cvsroot/digilib/CVSROOT/commitlog -m digilib-cvs@lists.berlios.de diff -r 705303c6d826 -r 2efb4b85a8aa CVSROOT/modules --- a/CVSROOT/modules Wed Jul 14 13:29:56 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -# Three different line formats are valid: -# key -a aliases... -# key [options] directory -# key [options] directory files... -# -# Where "options" are composed of: -# -i prog Run "prog" on "cvs commit" from top-level of module. -# -o prog Run "prog" on "cvs checkout" of module. -# -e prog Run "prog" on "cvs export" of module. -# -t prog Run "prog" on "cvs rtag" of module. -# -u prog Run "prog" on "cvs update" of module. -# -d dir Place module in directory "dir" instead of module name. -# -l Top-level directory only -- do not recurse. -# -# NOTE: If you change any of the "Run" options above, you'll have to -# release and re-checkout any working directories of these modules. -# -# And "directory" is a path to a directory relative to $CVSROOT. -# -# The "-a" option specifies an alias. An alias is interpreted as if -# everything on the right of the "-a" had been typed on the command line. -# -# You can encode a module within a module by using the special '&' -# character to interpose another module into the current module. This -# can be useful for creating a module that consists of many directories -# spread out over the entire source repository. diff -r 705303c6d826 -r 2efb4b85a8aa CVSROOT/notify --- a/CVSROOT/notify Wed Jul 14 13:29:56 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -# The "notify" file controls where notifications from watches set by -# "cvs watch add" or "cvs edit" are sent. The first entry on a line is -# a regular expression which is tested against the directory that the -# change is being made to, relative to the $CVSROOT. If it matches, -# then the remainder of the line is a filter program that should contain -# one occurrence of %s for the user to notify, and information on its -# standard input. -# -# "ALL" or "DEFAULT" can be used in place of the regular expression. -# -# For example: -#ALL mail %s -s "CVS notification" diff -r 705303c6d826 -r 2efb4b85a8aa CVSROOT/rcsinfo --- a/CVSROOT/rcsinfo Wed Jul 14 13:29:56 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -# The "rcsinfo" file is used to control templates with which the editor -# is invoked on commit and import. -# -# The first entry on a line is a regular expression which is tested -# against the directory that the change is being made to, relative to the -# $CVSROOT. For the first match that is found, then the remainder of the -# line is the name of the file that contains the template. -# -# If the repository name does not match any of the regular expressions in this -# file, the "DEFAULT" line is used, if it is specified. -# -# If the name "ALL" appears as a regular expression it is always used -# in addition to the first matching regex or "DEFAULT". diff -r 705303c6d826 -r 2efb4b85a8aa CVSROOT/taginfo --- a/CVSROOT/taginfo Wed Jul 14 13:29:56 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -# The "taginfo" file is used to control pre-tag checks. -# The filter on the right is invoked with the following arguments: -# -# $1 -- tagname -# $2 -- operation "add" for tag, "mov" for tag -F, and "del" for tag -d -# $3 -- repository -# $4-> file revision [file revision ...] -# -# A non-zero exit of the filter program will cause the tag to be aborted. -# -# The first entry on a line is a regular expression which is tested -# against the directory that the change is being committed to, relative -# to the $CVSROOT. For the first match that is found, then the remainder -# of the line is the name of the filter to run. -# -# If the repository name does not match any of the regular expressions in this -# file, the "DEFAULT" line is used, if it is specified. -# -# If the name "ALL" appears as a regular expression it is always used -# in addition to the first matching regex or "DEFAULT". diff -r 705303c6d826 -r 2efb4b85a8aa CVSROOT/verifymsg --- a/CVSROOT/verifymsg Wed Jul 14 13:29:56 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -# The "verifymsg" file is used to allow verification of logging -# information. It works best when a template (as specified in the -# rcsinfo file) is provided for the logging procedure. Given a -# template with locations for, a bug-id number, a list of people who -# reviewed the code before it can be checked in, and an external -# process to catalog the differences that were code reviewed, the -# following test can be applied to the code: -# -# Making sure that the entered bug-id number is correct. -# Validating that the code that was reviewed is indeed the code being -# checked in (using the bug-id number or a seperate review -# number to identify this particular code set.). -# -# If any of the above test failed, then the commit would be aborted. -# -# Actions such as mailing a copy of the report to each reviewer are -# better handled by an entry in the loginfo file. -# -# One thing that should be noted is the the ALL keyword is not -# supported. There can be only one entry that matches a given -# repository. diff -r 705303c6d826 -r 2efb4b85a8aa docu/installation.html --- a/docu/installation.html Wed Jul 14 13:29:56 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,372 +0,0 @@ - - - -Installation of alcatraz/digilib - - - -

What you need to install digilib

- -

Java JDK >1.2 (preferred 1.4 and up)
Jakarta - Tomcat version 4 or later (preferred 4.1 and up) from - http://jakarta.apache.org
The digilib distribution packages (from - http://developer.berlios.de) -
- alcatraz/digilib scripts and servlets package - alcatraz-core.zip
- digilib configuration files for tomcat 4 package on Linux/Unix - digilib-tomconf.zip (Not essential)
- digilib configuration files for tomcat 4 package on Windows - digilib-win-conf.zip (Not essential)
-

- -

Installation

- -

On Linux/Unix

- -

Make shure the Java JDK is installed (a JRE won't do).
Create a base directory for docuserver (the default used here is - /docuserver) and for the web interface - (/docuserver/www).
Unpack the alcatraz-core package in the web - interface directory (/docuserver/www). This will create - the digilib directory digitallibrary.
Unpack Jakarta Tomcat 4.1.24 in /docuserver This should - produce a directory /docuserver/jakarta-tomcat-4.1.24. Create a - link /docuserver/tomcat to the new directory.
(optional) Unpack the configuration files package - digilib-tomconf in the tomcat directory.
Create a link from the digilib directory into the Tomcat webapps - directory /docuserver/tomcat/webapps (type ln -s - /docuserver/www/digitallibrary /docuserver/tomcat/webapps) This is - the default installation running on port 8080 as - http://myserver:8080/digitallibrary/.
Adjust the path to the JDK and its options in - catalina.sh (in the directory - /docuserver/tomcat/bin, see below for details)
(optional) For SuSE Linux you can use the startup skript - tomcat/bin/rctomcat - to start and stop the tomcat server. Copy the script into - /etc/init.d as tomcat and set runlevel - links accordingly.
(optional) Set the tomcat directory and all files to be owned by - the user wwwrun (or whatever your webserver runs) and - use this account to start the tomcat server.
(optional) To use Mozilla-XUL functionality Alcatraz users have - to open the page - http://myserver:8080/docuserver/digitallibrary/xul/install.html - in a Mozilla compatible browser. There the users can find - instructions to install XUL-Components into their browser.

- - - - -

On Windows (quick install)

- -

Set the following Environment Variables:
- CATALINA_HOME = C:\jakarta-tomcat-4.1.24 (or similar)
- JAVA_HOME = C:\j2sdk (or similar) -

- -

-Start Tomcat server: Open a console window (start cmd.exe).
-Type: %CATALINA_HOME%\bin\startup -

- -

-Try the following URL in your browser: -http://localhost:8080 or -http://127.0.0.1:8080 -

- -

-You should now be able to see the Tomcat opening screen: If you're seeing this page via a web browser, it means you've setup Tomcat successfully. Congratulations! -

- -

-Shut it down again: In the console window type %CATALINA_HOME%\bin\shutdown. - -

-Extract the "Alcatraz" distribution, possibly to C:\docuserver. Modify the following configuration files according to your paths (as in the "On Linux" section): -

- -

For tomcat

C:\jakarta-tomcat-4.1.24\conf\server.xml
C:\jakarta-tomcat-4.1.24\conf\tomcat-users.xml

- - -

For digilib

C:\docuserver\digitallibrary\WEB-INF\web.xml
C:\docuserver\digitallibrary\WEB-INF\digilib-config.xml
C:\docuserver\digitallibrary\WEB-INF\digilib-auth.xml

- -

In the alcatraz-win-conf.zip package you can find -prepared configuration files with the following default values: - -

The image file directory is C:\bilder.
The username for viewing image files is digilib.
The password for viewing image files is digilib.
The digilib server runs on Port 9090.

- -

-Now you can restart the Tomcat server: http://localhost:9090 or -http://127.0.0.1:9090.

- -

-Watch the images: -http://localhost:9090/docuserver/digitallibrary/digilib.jsp?&lv=2 -

- - -

Configuration

- -

Tomcat

- -

catalina.sh / catalina.bat

- -

The file catalina.sh (in /docuserver/tomcat/bin -can be modified to provide the path to the JDK and runtime options -for the Java VM. Somewhere at the beginning of the file you can put two lines -like this:

- -

-export JAVA_HOME=/usr/local/lib/IBMJava2-14
-export CATALINA_OPTS="-mx512m"
-

- -

or, on Windows

- -

-set CATALINA_HOME=C:\jakarta-tomcat-4.1.24
-set JAVA_HOME=C:\j2sdk
-

- -

Adjust the JAVA_HOME path to point to your Java JDK -installation directory. You can adjust the memory used by the Java VM -with the -mx option.

- -

You can delete those two lines if you set these variables in your -shell before starting tomcat in that same shell. These lines are -needed if you want to use the startup script mentioned above under -linux .

- - -

tomcat-users.xml

- -

All passwords and usernames have to be set up in the file -tomcat-users.xml in /docuserver/tomcat/conf if you -want to use authentication in digilib. The file looks like this:

- -

-<tomcat-users>
-  <user name="tomcat" password="tomcat" roles="tomcat" />
-  <user name="role1"  password="tomcat" roles="role1"  />
-  <user name="both"   password="tomcat" roles="tomcat,role1" />
-</tomcat-users>
-

- -

A user is identified by a name and -password. These two elements have to be entered in a -authentication form presented by the browser when accessing a -restricted resource. A user can have one or more -roles. These roles will be used by digilib to decide if -an authenticated user is allowed to access a document (see -digilib-auth.xml below).

- -

If you want to use the webinterface to configure Tomcat, you have to -add administrational account with the roles admin and -manager.

- -

tomcat has to be restarted before changes to -tomcat-users.xml have effect!

- - -

Digilib

- -

web.xml

- -

The deployment of the digilib servlets and JSPs is defined in the -file web.xml in the WEB-INF subdirectory of -the digilib directory -(/docuserver/www/digitallibrary/WEB-INF).

- -

The only parameter you will have to adjust is the position of the -digilib configuration file. The parameter occurs twice in the file and -looks like this:

- -

-<!-- 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>
-

- -

Change the path to point where you installed the configuration files.

- -

Make shure to change the parameter in both places in the config -file! It is needed both for the servlet and the JSP pages!

- - -

digilib-config.xml

- -

The main configuration for digilib is -digilib-config.xml. It's position is defined by the -config-file init-parameter to the servlets (see -above).

- -

In the configuration file you can set several paths and -options. The file looks like this:

- -

-<!-- Digilib servlet config file -->
-
-<digilib-config>
-  <parameter name="debug-level" value="0" />
-
-  <!--  Image to be sent to indicate general failure. -->
-  <parameter name="error-image" value="/docuserver/images/icons/broken.gif" />
-
-  <!--  Image to be sent to indicate authorization failure. -->
-  <parameter name="denied-image" value="/docuserver/images/icons/alert.red.gif" />
-
-  <!-- List of directories where images are searched.
-       The authoritative directory with the high-resolution images
-       is first in list. -->
-  <parameter name="basedir-list" value="/docuserver/images:/docuserver/scaled/small" />
-
-  <!-- Java class to use for image operations -->
-  <parameter name="docuimage-class" value="digilib.image.JAIDocuImage" />
-
-  <!-- is sending whole image files with mo=file allowed? -->
-  <parameter name="sendfile-allowed" value="true" />
-
-  <!-- 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). -->
-  <parameter name="use-authorization" value="true" />
-
-  <!-- Location of XML file with authorization requirements. -->
-  <parameter name="auth-file" value="/docuserver/www/digitallibrary/WEB-INF/digilib-auth.xml" />
-
-  <!-- Part of URL to indicate authenticated access to Tomcat. -->
-  <parameter name="auth-url-path" value="authenticated/" />
-</digilib-config>
-

- -

You have to adjust the basedir-list parameter to the -directories where your images are installed. You need only one -directory if you do not have prescaled low resolution versions of your -images. The directory with the high-resolution versions must be the -first entry in the list.

- -

You can supply your own images for the "error" and -"access denied" messages by the servlet. Standard images -will be used if these parameters are undefined.

- -

The auth-file parameter has to point to the -authorization configuration file (see below).

- -

You can specify the Java toolkit implementation with the -docuimage-class parameter. The -ImageLoaderDocuImage might give best performance but -works only with JDK 1.4 and up. JAIDocuImage works with -JDK 1.3 and up.

- -

digilib-auth.xml

- -

The digilib access authorization is defined in the file defined by -the auth-file parameter (usually -digilib-auth.xml in WEB-INF).

- -

The file has two parts diglib-paths and -diglib-addresses. It looks like this:

- -

-<auth-config>
-
-  <digilib-paths>
-    <!-- 
-      A user must supply one of the roles under "role"
-      to access the directory "name".
-      Roles under "role" must be separated by comma only (no spaces).  
-    -->
-    <path name="histast/eastwood-collection" role="eastwood-coll" />
-    <path name="ptolemaios_geo" role="ptolemaios-geo" />
-  </digilib-paths>
-
-  <digilib-addresses>
-    <!-- 
-      A computer with an ip address that matches "ip"
-      is automatically granted all roles under "role".
-      The ip address is matched from the left (in full quads).
-      Roles under "role" must be separated by comma only (no spaces). 
-    -->
-    <address ip="127" role="local" />
-    <address ip="130.92.68" role="eastwood-coll,ptolemaios-geo" />
-    <address ip="130.92.151" role="ALL" />
-  </digilib-addresses>
-
-</auth-config>
-

- -

diglib-paths defines restricted directories and -the roles needed for access. The roles are defined with the users in -tomcat-users.xml (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.

- -

diglib-addresses defines hosts or networks of -computers that are automatically authenticated without username and -password. Hosts can be assigned roles. The special keyword ALL -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.

- - - -

robert.casties@philo.unibe.ch

-Last modified: Tue Sep 16 20:37:12 CEST 2003 - diff -r 705303c6d826 -r 2efb4b85a8aa xul/alcatraz.jar Binary file xul/alcatraz.jar has changed diff -r 705303c6d826 -r 2efb4b85a8aa xul/alcatraz.xpi Binary file xul/alcatraz.xpi has changed diff -r 705303c6d826 -r 2efb4b85a8aa xul/alcatraz_ohne_annota.jar Binary file xul/alcatraz_ohne_annota.jar has changed diff -r 705303c6d826 -r 2efb4b85a8aa xul/content/alcatraz.xul --- a/xul/content/alcatraz.xul Wed Jul 14 13:29:56 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - -