annotate servlet3/src/main/java/digilib/servlet/DigilibServletConfiguration.java @ 925:66f1ba72d07b

added timeout-parameter and timeout-handler to AsyncServletWorker. added stopNow abort method to ImageWorker.
author robcast
date Mon, 19 Dec 2011 21:39:17 +0100
parents 0cea7e608080
children 333e60e5cae9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
1 /*
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
2 * DigilibConfiguration -- Holding all parameters for digilib servlet.
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
3 *
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
4 * Digital Image Library servlet components
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
5 *
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
6 * Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
7 *
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
8 * This program is free software; you can redistribute it and/or modify it
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
9 * under the terms of the GNU General Public License as published by the Free
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
10 * Software Foundation; either version 2 of the License, or (at your option)
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
11 * any later version.
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
12 *
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
13 * Please read license.txt for the full details. A copy of the GPL may be found
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
14 * at http://www.gnu.org/copyleft/lgpl.html
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
15 *
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
16 * You should have received a copy of the GNU General Public License along with
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
17 * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
18 * Place, Suite 330, Boston, MA 02111-1307 USA
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
19 *
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
20 */
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
21
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
22 package digilib.servlet;
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
23
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
24 import java.io.File;
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
25 import java.util.Map;
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
26 import java.util.Map.Entry;
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
27
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
28 import javax.servlet.ServletContext;
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
29 import javax.servlet.ServletException;
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
30
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
31 import digilib.image.DocuImageImpl;
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
32 import digilib.io.FileOps;
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
33 import digilib.util.Parameter;
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
34 import digilib.util.XMLListLoader;
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
35
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
36 /**
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
37 * Class to hold the digilib servlet configuration parameters. The parameters
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
38 * can be read from the digilib-config file and be passed to other servlets or
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
39 * beans. <br>
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
40 * errorImgFileName: image file to send in case of error. <br>
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
41 * denyImgFileName: image file to send if access is denied. <br>
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
42 * baseDirs: array of base directories in order of preference (prescaled
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
43 * versions first). <br>
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
44 * useAuth: use authentication information. <br>
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
45 * authConfPath: authentication configuration file. <br>
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
46 * ... <br>
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
47 *
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
48 * @author casties
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
49 *
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
50 */
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
51 public class DigilibServletConfiguration extends DigilibConfiguration {
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
52
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
53 /**
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
54 * Definition of parameters and default values.
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
55 */
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
56 protected void initParams() {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
57 /*
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
58 * Definition of parameters and default values. System parameters that
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
59 * are not read from config file have a type 's'.
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
60 */
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
61
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
62 // digilib servlet version
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
63 newParameter("servlet.version", digilib.servlet.Scaler.getVersion(),
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
64 null, 's');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
65 // configuration file location
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
66 newParameter("servlet.config.file", null, null, 's');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
67 // DocuDirCache instance
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
68 newParameter("servlet.dir.cache", null, null, 's');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
69 // DocuImage class instance
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
70 newParameter("servlet.docuimage.class",
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
71 digilib.image.JAIDocuImage.class, null, 's');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
72 // AuthOps instance for authentication
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
73 newParameter("servlet.auth.op", null, null, 's');
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
74 // Executor for image operations
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
75 newParameter("servlet.worker.imageexecutor", null, null, 's');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
76 // Executor for PDF operations
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
77 newParameter("servlet.worker.pdfexecutor", null, null, 's');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
78 // Executor for PDF-image operations
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
79 newParameter("servlet.worker.pdfimageexecutor", null, null, 's');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
80
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
81 /*
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
82 * parameters that can be read from config file have a type 'f'
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
83 */
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
84
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
85 // image file to send in case of error
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
86 newParameter("error-image", new File("img/digilib-error.png"), null,
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
87 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
88 // image file to send if access is denied
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
89 newParameter("denied-image", new File("img/digilib-denied.png"), null,
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
90 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
91 // image file to send if image file not found
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
92 newParameter("notfound-image", new File("img/digilib-notfound.png"),
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
93 null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
94 // base directories in order of preference (prescaled versions last)
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
95 String[] bd = { "/docuserver/images", "/docuserver/scaled/small" };
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
96 newParameter("basedir-list", bd, null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
97 // use authentication information
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
98 newParameter("use-authorization", Boolean.FALSE, null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
99 // authentication configuration file
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
100 newParameter("auth-file", new File("digilib-auth.xml"), null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
101 // sending image files as-is allowed
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
102 newParameter("sendfile-allowed", Boolean.TRUE, null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
103 // Type of DocuImage instance
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
104 newParameter("docuimage-class", "digilib.image.JAIDocuImage", null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
105 // part of URL used to indicate authorized access
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
106 newParameter("auth-url-path", "authenticated/", null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
107 // degree of subsampling on image load
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
108 newParameter("subsample-minimum", new Float(2f), null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
109 // default scaling quality
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
110 newParameter("default-quality", new Integer(1), null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
111 // use mapping file to translate paths
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
112 newParameter("use-mapping", Boolean.FALSE, null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
113 // mapping file location
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
114 newParameter("mapping-file", new File("digilib-map.xml"), null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
115 // log4j config file location
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
116 newParameter("log-config-file", new File("log4j-config.xml"), null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
117 // maximum destination image size (0 means no limit)
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
118 newParameter("max-image-size", new Integer(0), null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
119 // number of working threads
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
120 newParameter("worker-threads", new Integer(1), null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
121 // max number of waiting threads
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
122 newParameter("max-waiting-threads", new Integer(20), null, 'f');
925
66f1ba72d07b added timeout-parameter and timeout-handler to AsyncServletWorker.
robcast
parents: 911
diff changeset
123 // timeout for worker threads (ms)
66f1ba72d07b added timeout-parameter and timeout-handler to AsyncServletWorker.
robcast
parents: 911
diff changeset
124 newParameter("worker-timeout", new Integer(60000), null, 'f');
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
125 // number of pdf-generation threads
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
126 newParameter("pdf-worker-threads", new Integer(1), null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
127 // max number of waiting pdf-generation threads
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
128 newParameter("pdf-max-waiting-threads", new Integer(20), null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
129 // number of pdf-image generation threads
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
130 newParameter("pdf-image-worker-threads", new Integer(1), null, 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
131 // max number of waiting pdf-image generation threads
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
132 newParameter("pdf-image-max-waiting-threads", new Integer(10), null,
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
133 'f');
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
134 // PDF generation temp directory
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
135 newParameter("pdf-temp-dir", "pdf_temp", null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
136 // PDF generation cache directory
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
137 newParameter("pdf-cache-dir", "pdf_cache", null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
138 // allow image toolkit to use disk cache
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
139 newParameter("img-diskcache-allowed", Boolean.TRUE, null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
140 // default type of error message (image, text, code)
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
141 newParameter("default-errmsg-type", "image", null, 'f');
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
142 }
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
143
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
144 /**
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
145 * Constructor taking a ServletConfig. Reads the config file location from
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
146 * an init parameter and loads the config file. Calls
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
147 * <code>readConfig()</code>.
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
148 *
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
149 * @see readConfig()
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
150 */
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
151 public DigilibServletConfiguration(ServletContext c) throws Exception {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
152 readConfig(c);
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
153 }
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
154
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
155 /**
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
156 * read parameter list from the XML file in init parameter "config-file" or
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
157 * file digilib-config.xml
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
158 */
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
159 @SuppressWarnings("unchecked")
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
160 public void readConfig(ServletContext c) throws Exception {
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
161
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
162 /*
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
163 * Get config file name. The file name is first looked for as an init
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
164 * parameter, then in a fixed location in the webapp.
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
165 */
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
166 if (c == null) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
167 // no config no file...
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
168 return;
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
169 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
170 String fn = c.getInitParameter("config-file");
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
171 if (fn == null) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
172 fn = ServletOps.getConfigFile("digilib-config.xml", c);
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
173 if (fn == null) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
174 logger.fatal("readConfig: no param config-file");
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
175 throw new ServletException("ERROR: no digilib config file!");
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
176 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
177 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
178 File f = new File(fn);
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
179 // setup config file list reader
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
180 XMLListLoader lilo = new XMLListLoader("digilib-config", "parameter",
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
181 "name", "value");
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
182 // read config file into HashMap
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
183 Map<String, String> confTable = lilo.loadURL(f.toURL().toString());
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
184
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
185 // set config file path parameter
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
186 setValue("servlet.config.file", f.getCanonicalPath());
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
187
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
188 /*
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
189 * read parameters
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
190 */
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
191
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
192 for (Entry<String, String> confEntry : confTable.entrySet()) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
193 Parameter p = get(confEntry.getKey());
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
194 if (p != null) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
195 if (p.getType() == 's') {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
196 // type 's' Parameters are not overwritten.
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
197 continue;
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
198 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
199 if (!p.setValueFromString(confEntry.getValue())) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
200 /*
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
201 * automatic conversion failed -- try special cases
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
202 */
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
203
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
204 // basedir-list
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
205 if (confEntry.getKey().equals("basedir-list")) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
206 // split list into directories
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
207 String[] dirs = FileOps.pathToArray(confEntry.getValue());
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
208 for (int j = 0; j < dirs.length; j++) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
209 // make relative directory paths be inside the webapp
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
210 dirs[j] = ServletOps.getFile(dirs[j], c);
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
211 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
212 if (dirs != null) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
213 p.setValue(dirs);
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
214 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
215 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
216 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
217 } else {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
218 // parameter unknown -- just add
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
219 newParameter(confEntry.getKey(), null, confEntry.getValue(),
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
220 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
221 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
222 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
223 // initialise static DocuImage class instance
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
224 DigilibServletConfiguration.docuImageClass = (Class<DocuImageImpl>) Class
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
225 .forName(getAsString("docuimage-class"));
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
226 }
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
227
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
228 }