annotate servlet2/src/main/java/digilib/servlet/DigilibServletConfiguration.java @ 1128:fcafcc8996be

css validates now (no more directx filter). removed superfluous comma (js runs but ie6 still not really happy :-)
author robcast
date Fri, 09 Nov 2012 19:48:04 +0100
parents 4e368c85cce4
children 2ee261676828
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
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
39 * beans. <br>errorImgFileName: image file to send in case of error. <br>
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
40 * denyImgFileName: image file to send if access is denied. <br>baseDirs:
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
41 * array of base directories in order of preference (prescaled versions first).
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
42 * <br>useAuth: use authentication information. <br>authConfPath:
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
43 * authentication configuration file. <br>... <br>
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
44 *
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
45 * @author casties
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
46 *
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 public class DigilibServletConfiguration extends DigilibConfiguration {
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
49
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 * Definition of parameters and default values.
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
52 */
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
53 protected void initParams() {
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
54 /*
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
55 * Definition of parameters and default values. System parameters that
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
56 * are not read from config file have a type 's'.
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
57 */
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
58
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
59 // digilib servlet version
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
60 newParameter(
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
61 "servlet.version",
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
62 digilib.servlet.Scaler.getVersion(),
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
63 null,
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
64 's');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
65 // configuration file location
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
66 newParameter("servlet.config.file", null, null, 's');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
67 // DocuDirCache instance
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
68 newParameter("servlet.dir.cache", null, null, 's');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
69 // DocuImage class instance
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
70 newParameter(
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
71 "servlet.docuimage.class",
960
b2d97b842612 moved DocuImage implementations with non-standard toolkits (JAI, ImgeJ) into separate Maven modules.
robcast
parents: 911
diff changeset
72 digilib.image.ImageLoaderDocuImage.class,
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
73 null,
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
74 's');
1032
4e368c85cce4 CLOSED - # 22: wrong contrast setting. dito #23 (at least on OSX 10.7)
robcast
parents: 960
diff changeset
75 // DocuImage version
4e368c85cce4 CLOSED - # 22: wrong contrast setting. dito #23 (at least on OSX 10.7)
robcast
parents: 960
diff changeset
76 newParameter("servlet.docuimage.version",
4e368c85cce4 CLOSED - # 22: wrong contrast setting. dito #23 (at least on OSX 10.7)
robcast
parents: 960
diff changeset
77 "?", null, 's');
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
78 // AuthOps instance for authentication
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
79 newParameter("servlet.auth.op", null, null, 's');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
80 // Executor for image operations
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
81 newParameter("servlet.worker.imageexecutor", null, null, 's');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
82 // Executor for PDF operations
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
83 newParameter("servlet.worker.pdfexecutor", null, null, 's');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
84 // Executor for PDF-image operations
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
85 newParameter("servlet.worker.pdfimageexecutor", null, null, 's');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
86
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
87 /*
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
88 * parameters that can be read from config file have a type 'f'
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
89 */
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
90
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
91 // image file to send in case of error
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
92 newParameter(
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
93 "error-image",
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
94 new File("img/digilib-error.png"),
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
95 null,
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
96 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
97 // image file to send if access is denied
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
98 newParameter(
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
99 "denied-image",
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
100 new File("img/digilib-denied.png"),
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
101 null,
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
102 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
103 // image file to send if image file not found
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
104 newParameter(
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
105 "notfound-image",
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
106 new File("img/digilib-notfound.png"),
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
107 null,
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
108 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
109 // base directories in order of preference (prescaled versions last)
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
110 String[] bd = { "/docuserver/images", "/docuserver/scaled/small" };
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
111 newParameter("basedir-list", bd, null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
112 // use authentication information
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
113 newParameter("use-authorization", Boolean.FALSE, null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
114 // authentication configuration file
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
115 newParameter("auth-file", new File("digilib-auth.xml"), null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
116 // sending image files as-is allowed
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
117 newParameter("sendfile-allowed", Boolean.TRUE, null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
118 // Type of DocuImage instance
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
119 newParameter(
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
120 "docuimage-class",
960
b2d97b842612 moved DocuImage implementations with non-standard toolkits (JAI, ImgeJ) into separate Maven modules.
robcast
parents: 911
diff changeset
121 "digilib.image.ImageLoaderDocuImage",
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
122 null,
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
123 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
124 // part of URL used to indicate authorized access
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
125 newParameter("auth-url-path", "authenticated/", null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
126 // degree of subsampling on image load
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
127 newParameter("subsample-minimum", new Float(2f), null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
128 // default scaling quality
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
129 newParameter("default-quality", new Integer(1), null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
130 // use mapping file to translate paths
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
131 newParameter("use-mapping", Boolean.FALSE, null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
132 // mapping file location
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
133 newParameter("mapping-file", new File("digilib-map.xml"), null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
134 // log4j config file location
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
135 newParameter("log-config-file", new File("log4j-config.xml"), null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
136 // maximum destination image size (0 means no limit)
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
137 newParameter("max-image-size", new Integer(0), null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
138 // number of working threads
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
139 newParameter("worker-threads", new Integer(1), null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
140 // max number of waiting threads
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
141 newParameter("max-waiting-threads", new Integer(20), null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
142 // number of pdf-generation threads
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
143 newParameter("pdf-worker-threads", new Integer(1), null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
144 // max number of waiting pdf-generation threads
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
145 newParameter("pdf-max-waiting-threads", new Integer(20), null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
146 // number of pdf-image generation threads
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
147 newParameter("pdf-image-worker-threads", new Integer(1), null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
148 // max number of waiting pdf-image generation threads
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
149 newParameter("pdf-image-max-waiting-threads", new Integer(10), null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
150 // PDF generation temp directory
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
151 newParameter("pdf-temp-dir", "pdf_temp", null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
152 // PDF generation cache directory
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
153 newParameter("pdf-cache-dir", "pdf_cache", null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
154 // allow image toolkit to use disk cache
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
155 newParameter("img-diskcache-allowed", Boolean.TRUE, null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
156 // default type of error message (image, text, code)
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
157 newParameter("default-errmsg-type", "image", null, 'f');
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
158 }
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
159
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
160 /**
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
161 * Constructor taking a ServletConfig. Reads the config file location from
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
162 * an init parameter and loads the config file. Calls <code>readConfig()</code>.
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
163 *
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
164 * @see readConfig()
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
165 */
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
166 public DigilibServletConfiguration(ServletContext c) throws Exception {
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
167 readConfig(c);
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
168 }
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
169
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
170 /**
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
171 * 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
172 * file digilib-config.xml
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
173 */
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
174 @SuppressWarnings("unchecked")
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
175 public void readConfig(ServletContext c) throws Exception {
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
176
911
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 * 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
179 * parameter, then in a fixed location in the webapp.
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
180 */
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
181 if (c == null) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
182 // no config no file...
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
183 return;
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
184 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
185 String fn = c.getInitParameter("config-file");
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
186 if (fn == null) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
187 fn = ServletOps.getConfigFile("digilib-config.xml", c);
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
188 if (fn == null) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
189 logger.fatal("readConfig: no param config-file");
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
190 throw new ServletException("ERROR: no digilib config file!");
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
191 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
192 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
193 File f = new File(fn);
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
194 // setup config file list reader
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
195 XMLListLoader lilo = new XMLListLoader("digilib-config", "parameter",
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
196 "name", "value");
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
197 // read config file into HashMap
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
198 Map<String, String> confTable = lilo.loadURL(f.toURL().toString());
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
199
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
200 // set config file path parameter
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
201 setValue("servlet.config.file", f.getCanonicalPath());
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
202
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
203 /*
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
204 * read parameters
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
205 */
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
206
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
207 for (Entry<String, String> confEntry : confTable.entrySet()) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
208 Parameter p = get(confEntry.getKey());
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
209 if (p != null) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
210 if (p.getType() == 's') {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
211 // type 's' Parameters are not overwritten.
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
212 continue;
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
213 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
214 if (!p.setValueFromString(confEntry.getValue())) {
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 * automatic conversion failed -- try special cases
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
217 */
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
218
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
219 // basedir-list
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
220 if (confEntry.getKey().equals("basedir-list")) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
221 // split list into directories
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
222 String[] dirs = FileOps.pathToArray(confEntry.getValue());
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
223 for (int j = 0; j < dirs.length; j++) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
224 // make relative directory paths be inside the webapp
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
225 dirs[j] = ServletOps.getFile(dirs[j], c);
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
226 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
227 if (dirs != null) {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
228 p.setValue(dirs);
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
229 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
230 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
231 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
232 } else {
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
233 // parameter unknown -- just add
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
234 newParameter(confEntry.getKey(), null, confEntry.getValue(),
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
235 'f');
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
236 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
237 }
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
238 // initialise static DocuImage class instance
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
239 DigilibServletConfiguration.docuImageClass = (Class<DocuImageImpl>) Class
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
240 .forName(getAsString("docuimage-class"));
1032
4e368c85cce4 CLOSED - # 22: wrong contrast setting. dito #23 (at least on OSX 10.7)
robcast
parents: 960
diff changeset
241 setValue("servlet.docuimage.version", getDocuImageInstance().getVersion());
911
0cea7e608080 add relative-basedir back in. fix digicat.
robcast
parents: 903
diff changeset
242 }
903
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
243
7779b37d1d05 refactored into maven modules per servlet type.
robcast
parents:
diff changeset
244 }