# HG changeset patch
# User robcast
# Date 1323455009 -3600
# Node ID a00114a0c95736b9da1353e6fb5054ef02cceb92
# Parent  07c989c41b4fdd2f5ded253ac9e6ad04d73e85f8
add current berlios website pages to repo

diff -r 07c989c41b4f -r a00114a0c957 .hgignore
--- a/.hgignore	Tue Dec 06 19:05:13 2011 +0100
+++ b/.hgignore	Fri Dec 09 19:23:29 2011 +0100
@@ -57,4 +57,8 @@
 syntax: regexp
 ^\.settings$
 syntax: regexp
-^servlet3/bin$
\ No newline at end of file
+^servlet3/bin$
+syntax: regexp
+^digilib-log\.txt$
+syntax: regexp
+^dl-access-log\.txt$
\ No newline at end of file
diff -r 07c989c41b4f -r a00114a0c957 webapp/doc/digilib_install.html
--- a/webapp/doc/digilib_install.html	Tue Dec 06 19:05:13 2011 +0100
+++ b/webapp/doc/digilib_install.html	Fri Dec 09 19:23:29 2011 +0100
@@ -9,32 +9,29 @@
 
 <ul>
   <li>
-  <a href="http://java.sun.com/downloads/index.html" >Java JDK</a> &gt;1.2 (preferred 1.4 and up)
+  <a href="http://java.sun.com/downloads/index.html" >Java JDK</a> &gt;=1.5
   </li>
   
   <li>
   <a href="http://jakarta.apache.org/tomcat/index.html" >Jakarta
-  Tomcat</a> version 4 or later (preferred 4.1 and up) from
+  Tomcat</a> version 4 or later (preferred 6 and up) from
   <a href="http://jakarta.apache.org">http://jakarta.apache.org</a>
   </li>
   
-  <li>The digilib distribution package <a href="http://download.berlios.de/digilib/digilib-core.zip"><b>digilib-core.zip</b></a> (from
-  <a href="http://developer.berlios.de">http://developer.berlios.de</a>)
+  <li>The digilib distribution package <b>digilib-core-X.X.X.zip</b></a> (from
+  <a href="http://developer.berlios.de/project/showfiles.php?group_id=251">http://developer.berlios.de</a>)
   
   </li>
 
-  <li>Some auxiliary Java libraries to be put in <code>digitallibrary/WEB-INF/lib</code> (can also be found in the <a href="http://download.berlios.de/digilib/digilib-ext.zip">digilib-ext.zip</a> package)
+  <li>Some auxiliary Java libraries to be put in <code>digitallibrary/WEB-INF/lib</code> (can also be found in the <a href="http://developer.berlios.de/project/showfiles.php?group_id=251">digilib-ext-X.X.zip</a> package)
   <ul>
-    <li>
-    <b>concurrent.jar</b> from Doug Lea's <a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html">util.concurrent library</a> (see <a href="http://gee.cs.oswego.edu/dl/">http://gee.cs.oswego.edu/dl/</a>).
-    </li>
 
     <li>
     <b>log4j.jar</b> from the <a href="http://logging.apache.org/log4j/docs/download.html">Log4J library</a> (see <a href="http://logging.apache.org">http://logging.apache.org</a>)
     </li>
 
     <li>
-    <b>jai_imageio.jar</b> (and its native libraries) with JDK >= 1.4, from the <a href="http://java.sun.com/products/java-media/jai/current.html">Java Advanced Imaging Image-IO Tools</a> (see <a href="http://java.sun.com/products/java-media/jai/index.jsp">http://java.sun.com/products/java-media/jai/</a>)
+    <b>jai_imageio.jar</b> (and its native libraries) from the <a href="https://jai-imageio.dev.java.net/binary-builds.htmll">Java Advanced Imaging Image-IO Tools</a> (see <a href="http://jai-imageio.dev.java.net/">https://jai-imageio.dev.java.net/</a>)
     </li>
 
     <li>
@@ -42,12 +39,13 @@
     </li>
 
     <li>
-    <b>batik-*.jar</b> if you want to use the Raster servlet, from the <a href="http://www.apache.org/dyn/closer.cgi/xml/batik">Apache Batik library</a> (see <a href="http://xml.apache.org/batik/">http://xml.apache.org/batik/</a>)
+    <b>itext.jar</b> for PDF generation from the <a href="http://itextpdf.com/download.php">iText library</a> (see <a href="http://itextpdf.com/itext.php">http://itextpdf.com/itext.php</a>)
     </li>
 
     <li>
-    <b>jena.jar</b> from the <a href="http://www.hpl.hp.com/semweb/jena1.htm">JENA RDF library version 1.6.1</a> (see <a href="http://jena.sourceforge.net/">http://jena.sourceforge.net/</a>)
+    <b>jdom.jar</b> from the <a href="http://www.jdom.org/downloads/index.html">JDOM library</a> (see <a href="http://www.jdom.org/index.html">http://www.jdom.org</a>)
     </li>
+
   </ul>
 </ul>
 
@@ -301,9 +299,7 @@
 
 <p>You can specify the Java toolkit implementation with the
 <code>docuimage-class</code> parameter. The
-<code>ImageLoaderDocuImage</code> might give best performance but
-works only with JDK 1.4 and up. <code>JAIDocuImage</code> works with
-JDK 1.3 and up.</p>
+<code>ImageLoaderDocuImage</code> usually gives best performance and works with JDK 1.4 and up.</p>
 
 
 <h3>digilib-auth.xml</h3>
@@ -361,5 +357,4 @@
 
 <hr>
 <address>robcast@mail.berlios.de</address>
-<!-- hhmts start -->Last modified: Tue Nov  2 13:14:57 CET 2004 <!-- hhmts end -->
-</body> </html>
+</html>
diff -r 07c989c41b4f -r a00114a0c957 webapp/doc/digilib_interop.html
--- a/webapp/doc/digilib_interop.html	Tue Dec 06 19:05:13 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-  <title>digilib toolbar interoperability</title>
-</head>
-<body>
-<h1>Interoperability of digilib HTML pages with the Alcatraz toolbar</h1>
-
-<p>A toolbar-friendly digilib page must define a Javascript variable
-<b><code>toolbarEnabledURL</code></b> whose value is a HTTP URL that
-produces a <em>toolbar-enabled</em> page. The toolbar should present a
-button to &quot;take over&quot; the page design by replacing
-the current page with the page from the given URL.</p>
-
-<h2>Toolbar-enabled page</h2>
-
-<p>A <em>toolbar-enabled</em> page must offer the following Javascript functions:</p>
-
-<h3>Identification</h3>
-
-<ul>
-  <li><b><code>dlScriptVersion</code></b>: a String variable that contains the version number of the Javascript code (e.g. &quot;1.12b3&quot;)<br>
-  The existence of this variable can be used to test for a <em>toolbar-enabled</em> page</li>
-</ul>
-
-<h3>Interactive operations</h3>
-
-<ul>
-  <li><b><code>setMark()</code></b>: lets the user click and sets a mark at the clicked location</li>
-  <li><b><code>zoomArea()</code></b>: lets the user click to select an area and zooms to the selected area</li>
-  <li><b><code>moveCenter()</code></b>: lets the user click and recenters the image around the clicked location</li>
-</ul>
-
-<h3>Page operations</h3>
-
-<ul>
-  <li><b><code>getRef()</code></b>: returns a String with a URL reference to the current document</li>
-  <li><b><code>removeMark()</code></b>: removes the last mark</li>
-  <li><b><code>zoomBy(float factor)</code></b>: magnifies the image by the given factor around the current center</li>
-  <li><b><code>zoomFullpage()</code></b>: zooms out so that the whole image is visible</li>
-  <li><b><code>display(int prio)</code></b>: reloads the page with the current parameters</li>
-</ul>
-
-<h3>Parameter operations</h3>
-
-<ul>
-  <li><b><code>newParameter(String name, String defaultValue, int prio)</code></b>: declares a new parameter with name, default value (can be of any type) and priority</li>
-  <li><b><code>getParameter(String name)</code></b>: returns the value of the parameter with the name <code>name</code></li>
-  <li><b><code>setParameter(String name, String value)</code></b>: sets the value of the named parameter (value can be of any type)</li>
-  <li><b><code>getAllParameters(int prio)</code></b>: returns a String of all parameters in HTTP request format (name=value) below the given priority</li>
-  <li><b><code>addMark(Position pos)</code></b>: adds a mark with the given Position</li>
-  <li><b><code>deleteMark()</code></b>: removes the last mark form the list</li>
-  <li><b><code>getAllMarks()</code></b>: returns a String with all current marks in digilib format (for parameter &quot;mk&quot;)</li>
-  <li><b><code>addFlag(String name)</code></b>: adds a digilib mode flag with the given name</li>
-  <li><b><code>hasFlag(String name)</code></b>: returns if the given flag is currently set</li>
-  <li><b><code>removeFlag(String name)</code></b>: removes the given flag</li>
-  <li><b><code>toggleFlag(String name)</code></b>: toggles the given flag</li>
-  <li><b><code>getAllFlags()</code></b>: returns a String with all current flags in digilib format (for parameter &quot;mo&quot;)</li>
-</ul>
-
-</body>
-</html>
\ No newline at end of file
diff -r 07c989c41b4f -r a00114a0c957 webapp/doc/old/digilib_interop.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/webapp/doc/old/digilib_interop.html	Fri Dec 09 19:23:29 2011 +0100
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+  <title>digilib toolbar interoperability</title>
+</head>
+<body>
+<h1>Interoperability of digilib HTML pages with the Alcatraz toolbar</h1>
+
+<p>A toolbar-friendly digilib page must define a Javascript variable
+<b><code>toolbarEnabledURL</code></b> whose value is a HTTP URL that
+produces a <em>toolbar-enabled</em> page. The toolbar should present a
+button to &quot;take over&quot; the page design by replacing
+the current page with the page from the given URL.</p>
+
+<h2>Toolbar-enabled page</h2>
+
+<p>A <em>toolbar-enabled</em> page must offer the following Javascript functions:</p>
+
+<h3>Identification</h3>
+
+<ul>
+  <li><b><code>dlScriptVersion</code></b>: a String variable that contains the version number of the Javascript code (e.g. &quot;1.12b3&quot;)<br>
+  The existence of this variable can be used to test for a <em>toolbar-enabled</em> page</li>
+</ul>
+
+<h3>Interactive operations</h3>
+
+<ul>
+  <li><b><code>setMark()</code></b>: lets the user click and sets a mark at the clicked location</li>
+  <li><b><code>zoomArea()</code></b>: lets the user click to select an area and zooms to the selected area</li>
+  <li><b><code>moveCenter()</code></b>: lets the user click and recenters the image around the clicked location</li>
+</ul>
+
+<h3>Page operations</h3>
+
+<ul>
+  <li><b><code>getRef()</code></b>: returns a String with a URL reference to the current document</li>
+  <li><b><code>removeMark()</code></b>: removes the last mark</li>
+  <li><b><code>zoomBy(float factor)</code></b>: magnifies the image by the given factor around the current center</li>
+  <li><b><code>zoomFullpage()</code></b>: zooms out so that the whole image is visible</li>
+  <li><b><code>display(int prio)</code></b>: reloads the page with the current parameters</li>
+</ul>
+
+<h3>Parameter operations</h3>
+
+<ul>
+  <li><b><code>newParameter(String name, String defaultValue, int prio)</code></b>: declares a new parameter with name, default value (can be of any type) and priority</li>
+  <li><b><code>getParameter(String name)</code></b>: returns the value of the parameter with the name <code>name</code></li>
+  <li><b><code>setParameter(String name, String value)</code></b>: sets the value of the named parameter (value can be of any type)</li>
+  <li><b><code>getAllParameters(int prio)</code></b>: returns a String of all parameters in HTTP request format (name=value) below the given priority</li>
+  <li><b><code>addMark(Position pos)</code></b>: adds a mark with the given Position</li>
+  <li><b><code>deleteMark()</code></b>: removes the last mark form the list</li>
+  <li><b><code>getAllMarks()</code></b>: returns a String with all current marks in digilib format (for parameter &quot;mk&quot;)</li>
+  <li><b><code>addFlag(String name)</code></b>: adds a digilib mode flag with the given name</li>
+  <li><b><code>hasFlag(String name)</code></b>: returns if the given flag is currently set</li>
+  <li><b><code>removeFlag(String name)</code></b>: removes the given flag</li>
+  <li><b><code>toggleFlag(String name)</code></b>: toggles the given flag</li>
+  <li><b><code>getAllFlags()</code></b>: returns a String with all current flags in digilib format (for parameter &quot;mo&quot;)</li>
+</ul>
+
+</body>
+</html>
\ No newline at end of file
diff -r 07c989c41b4f -r a00114a0c957 webapp/doc/website/history.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/webapp/doc/website/history.html	Fri Dec 09 19:23:29 2011 +0100
@@ -0,0 +1,71 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+            "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <title>digilib -- history</title>
+</head>
+<body>
+
+<table border="0" cellspacing="0" cellpadding="3">
+  <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">
+      <p><a href="http://digilib.berlios.de/">Info</a></p>
+      <p><a href="http://developer.berlios.de/projects/digilib/">Project</a></p>
+      <p><a href="http://developer.berlios.de/project/showfiles.php?group_id=251">Download</a></p>
+      <p><a href="http://developer.berlios.de/docman/?group_id=251">Docs</a></p>
+      <p><a
+href="https://openfacts2.berlios.de/wikien/index.php/BerliosProject:Digital_Image_Library">Tips</a></p>
+      <p><a href="http://hg.berlios.de/repos/digilib">Source</a></p>
+    </td>
+    <td>
+      
+<h2>Early history of digilib (in German)</h2>
+
+<h3>docuedit (auch DocumentDatabase, später doculight)</h3>
+
+<p>Imageviewer mit Dokumenten-Baum Ansicht, in Java geschrieben, komplett
+Client-seitig. Entstanden vor März 1998 (müsste am MPIWG gewesen sein).
+Wesentlicher Autor Michael May (glaube ich).</p>
+
+<p>Von doculight gibt es hier sogar noch eine "Web-Version" von Anfang 2000
+aus Bern, die aber nicht mehr ganz funktioniert:
+<br/>
+<a href="http://pythia2.unibe.ch/docuserver/viewerlite/frame.htm">http://pythia2.unibe.ch/docuserver/viewerlite/frame.htm</a>
+</p>
+
+<p>Und hier ist der Übergang zur Client-Server Lösung "gg.jsp" (noch ohne
+serverseitige Skalierung der Seiten) vom Juni 2000, das leider mangels
+JSP auf dem Server nicht mehr geht: 
+<br/>
+<a href="http://pythia2.unibe.ch/docuserver/viewerlite/gg.jsp">http://pythia2.unibe.ch/docuserver/viewerlite/gg.jsp</a>
+<br/>
+(Die Knöpfe sind zwar noch schlicht haben aber schon die gleichen
+Funktionen wie später)</p>
+
+<h3>digilib (ScaleServlet, später Scaler)</h3>
+
+<p>Client-Server Lösung mit Javascript auf dem Client und Java auf dem Server. Entstanden ca. Juli 2000. Wesentlicher Autor zunächst Robert Gordesch (Stud. Hilfskraft MPIWG) für den Server-Teil in Java und Gerd Graßhoff (Bern) fürs Javascript (glaube ich), seit Februar 2001 Robert Casties (Bern, ab 2002 MPIWG), danach auch Christian Luginbühl. Seit Anfang 2002 Open Source Projekt bei BerliOS.
+</p>
+
+<h2>Articles on digilib</h2>
+
+<ol>
+  <li>Raspe, Martin; Casties, Robert; "Digilib: Wissenschaftliches Bildmaterial studieren und kommentieren 
+im Internet", Jahrbuch der Max-Planck-Gesellschaft 2006, <a href="http://www.mpg.de/411123/pdf.pdf">http://www.mpg.de/411123/pdf.pdf</a></li>
+</ol>
+
+<p 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> 
+</p>
+
+</body>
+</html>
diff -r 07c989c41b4f -r a00114a0c957 webapp/doc/website/images/digilib-logo-big.png
Binary file webapp/doc/website/images/digilib-logo-big.png has changed
diff -r 07c989c41b4f -r a00114a0c957 webapp/doc/website/index.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/webapp/doc/website/index.html	Fri Dec 09 19:23:29 2011 +0100
@@ -0,0 +1,125 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+            "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <title>digilib -- Digital Image Library</title>
+</head>
+<body>
+
+<table border="0" cellspacing="0" cellpadding="3">
+  <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">
+      <p><a href="#whatis" >Info</a></p>
+      <p><a href="http://developer.berlios.de/projects/digilib/" >Project</a></p>
+      <p><a href="http://developer.berlios.de/project/showfiles.php?group_id=251" >Download</a></p>
+      <p><a href="http://developer.berlios.de/docman/?group_id=251" >Docs</a></p>
+      <p><a
+href="https://openfacts2.berlios.de/wikien/index.php/BerliosProject:Digital_Image_Library">Tips</a></p>
+      <p><a href="http://hg.berlios.de/repos/digilib">Source</a></p>
+    </td>
+    <td>
+      
+<a name="news"></a>
+<h2>News</h2>
+
+<dl>
+  <dt>25.5.2011</dt>
+  <dd>Special offer of the
+  day: <a href="/tmp/digilib-tomcat-2.1b1.zip">latest digilib beta with Tomcat
+  all-in-one version</a> - download, unpack, open terminal/cmd.exe, change to download directory, execute catalina.sh/.bat run, open your browser on <a href="http://localhost:8080/digitallibrary/jquery/digilib.html?fn=test">http://localhost:8080/digitallibrary/jquery/digilib.html?fn=test</a>.
+  </dd>
+
+  <dt>7.1.2011</dt>
+  <dd>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/>
+  SVG rendering (which never worked properly) and some other old stuff has
+  been removed. Some library dependencies have changed, check your setup
+  when upgrading.
+  </dd>
+
+  <dt>15.7.2010</dt> 
+  <dd>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...  
+  </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 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>
+  
+  <dt>9.2.2007</dt>
+  <dd>Finally a new File release (1.6.0). And an <a href="http://cvs.berlios.de/cgi-bin/viewcvs.cgi/digilib/config/build.xml">Ant build file</a>.</dd>
+  
+  <dt>6.12.2005</dt>
+  <dd><tt>digilib</tt> has it's own icon now!</dd>
+  
+  <dt>22.11.2005</dt>
+  <dd>New &quot;Tips&quot; section in the Wiki</dd>
+</dl>
+
+<a name="whatis"></a>
+<h2>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.
+</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.
+</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.
+</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.
+</li>
+<li><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 of Bern</a> 
+  and others.
+</li>
+</ul>
+
+<a name="howtoget"></a>
+<h2>Where can I get <tt>digilib</tt></h2>
+
+<p><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>
+</table>
+<p 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> 
+</p>
+
+</body>
+</html>
diff -r 07c989c41b4f -r a00114a0c957 webapp/doc/website/tmp/digilib-tomcat-2.1b1.zip
Binary file webapp/doc/website/tmp/digilib-tomcat-2.1b1.zip has changed