annotate servlet2/src/main/java/digilib/servlet/DigilibServletConfiguration.java @ 1158:2ee261676828 default tip

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