# HG changeset patch
# User robcast
# Date 1303810691 -7200
# Node ID 89ba3ffcf55288f35b4fa38045d2ee8c53491979
# Parent  cad6d3d5aeb3cd011f5814c7e802154ea9dc7c24# Parent  1b627b5c9fad5c2ed7b50e1045456e7e762b1a26
merge jquery + mvn into default

diff -r 1b627b5c9fad -r 89ba3ffcf552 client/src/main/webapp/WEB-INF/digilib-config.xml
--- a/client/src/main/webapp/WEB-INF/digilib-config.xml	Tue Apr 26 10:44:10 2011 +0200
+++ b/client/src/main/webapp/WEB-INF/digilib-config.xml	Tue Apr 26 11:38:11 2011 +0200
@@ -37,6 +37,9 @@
   <!-- number of working threads -->
   <parameter name="worker-threads" value="2" />
 
+  <!-- number of waiting requests in queue -->
+  <parameter name="max-waiting-threads" value="20" />
+
   <!-- Restrict access to authorized users.
        User authentication and roles are provided by the servlet container 
        (see tomcat-users.xml).
@@ -60,13 +63,25 @@
   <parameter name="log-config-file" value="log4j-config.xml"/>
 
   <!-- location for PDF files while still in progress -->
-  <parameter name="pdf-temp-dir" value="/tmp/pdf_tmp/" />
+  <parameter name="pdf-temp-dir" value="/tmp/pdf_tmp" />
   
   <!-- location for PDF files upon completion -->
-  <parameter name="pdf-cache-dir" value="/tmp/pdf_cache/"/>
+  <parameter name="pdf-cache-dir" value="/tmp/pdf_cache"/>
+
+  <!-- number of PDF generation threads -->
+  <parameter name="pdf-worker-threads" value="1" />
+
+  <!-- number of waiting PDF requests in queue -->
+  <parameter name="pdf-max-waiting-threads" value="20" />
+
+  <!-- number of image generation threads for PDF -->
+  <parameter name="pdf-image-worker-threads" value="1" />
+
+  <!-- number of waiting image requests for PDF in queue -->
+  <parameter name="pdf-image-max-waiting-threads" value="10" />
 
   <!-- logo for PDFs -->
-  <parameter name="pdf-logo" value="http://www.mpiwg-berlin.mpg.de/de/images/logo.png" />
+  <parameter name="pdf-logo" value="http://digilib.berlios.de/images/digilib-logo-big.png" />
 
   <!-- is the image toolkit allowed to use a disk cache -->
   <parameter name="img-diskcache-allowed" value="false"/>
diff -r 1b627b5c9fad -r 89ba3ffcf552 servlet/src/main/java/digilib/servlet/DigilibConfiguration.java
--- a/servlet/src/main/java/digilib/servlet/DigilibConfiguration.java	Tue Apr 26 10:44:10 2011 +0200
+++ b/servlet/src/main/java/digilib/servlet/DigilibConfiguration.java	Tue Apr 26 11:38:11 2011 +0200
@@ -26,7 +26,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.servlet.ServletContext;
+import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 
 import org.apache.log4j.BasicConfigurator;
@@ -35,10 +35,10 @@
 import digilib.image.DocuImage;
 import digilib.image.DocuImageImpl;
 import digilib.io.FileOps;
-import digilib.io.ImageInput;
+import digilib.io.ImageFile;
+import digilib.io.XMLListLoader;
 import digilib.util.Parameter;
 import digilib.util.ParameterMap;
-import digilib.util.XMLListLoader;
 
 /**
  * Class to hold the digilib servlet configuration parameters. The parameters
@@ -172,10 +172,6 @@
         newParameter("pdf-temp-dir", "pdf_temp", null, 'f');
         // PDF generation cache directory
         newParameter("pdf-cache-dir", "pdf_cache", null, 'f');
-		// allow image toolkit to use disk cache
-		newParameter("img-diskcache-allowed", Boolean.TRUE, null, 'f');
-		// default type of error message (image, text, code)
-        newParameter("default-errmsg-type", "image", null, 'f');
 	}
 
 	/**
@@ -184,7 +180,7 @@
 	 * 
 	 * @see readConfig()
 	 */
-	public DigilibConfiguration(ServletContext c) throws Exception {
+	public DigilibConfiguration(ServletConfig c) throws Exception {
 		this();
 		readConfig(c);
 	}
@@ -194,7 +190,7 @@
 	 * or file digilib-config.xml
 	 */
 	@SuppressWarnings("unchecked")
-    public void readConfig(ServletContext c) throws Exception {
+    public void readConfig(ServletConfig c) throws Exception {
 
 		/*
 		 * Get config file name. The file name is first looked for as an init
@@ -217,7 +213,7 @@
 		XMLListLoader lilo =
 			new XMLListLoader("digilib-config", "parameter", "name", "value");
 		// read config file into HashMap
-		Map<String,String> confTable = lilo.loadURL(f.toString());
+		Map<String,String> confTable = lilo.loadURL(f.toURL().toString());
 
 		// set config file path parameter
 		setValue("servlet.config.file", f.getCanonicalPath());
@@ -279,7 +275,7 @@
 	 * @return
 	 * @throws IOException
 	 */
-	public static ImageInput identifyDocuImage(ImageInput imgf) throws IOException {
+	public static ImageFile docuImageIdentify(ImageFile imgf) throws IOException {
 	    // use fresh DocuImage instance
 	    DocuImage di = getDocuImageInstance();
 		return di.identify(imgf);