Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/backend/SedDBCredentials.java @ 8485:026f4c684ee5
Make maxWait configurable and wait for 30 seconds
| author | "Tom Gottfried <tom@intevation.de>" |
|---|---|
| date | Fri, 28 Nov 2014 16:34:40 +0100 |
| parents | c5a7aae52396 |
| children | 6a4bdcccfa4d |
comparison
equal
deleted
inserted
replaced
| 8484:8c615d738e84 | 8485:026f4c684ee5 |
|---|---|
| 85 "/artifact-database/seddb-database/connection-init-sqls/text()"; | 85 "/artifact-database/seddb-database/connection-init-sqls/text()"; |
| 86 | 86 |
| 87 public static final String XPATH_VALIDATION_QUERY = | 87 public static final String XPATH_VALIDATION_QUERY = |
| 88 "/artifact-database/seddb-database/validation-query/text()"; | 88 "/artifact-database/seddb-database/validation-query/text()"; |
| 89 | 89 |
| 90 public static final String XPATH_MAX_WAIT = | |
| 91 "/artifact-database/seddb-database/max-wait/text()"; | |
| 92 | |
| 90 public static final String DEFAULT_USER = | 93 public static final String DEFAULT_USER = |
| 91 System.getProperty("flys.seddb.user", "seddb"); | 94 System.getProperty("flys.seddb.user", "seddb"); |
| 92 | 95 |
| 93 public static final String DEFAULT_PASSWORD = | 96 public static final String DEFAULT_PASSWORD = |
| 94 System.getProperty("flys.seddb.password", "seddb"); | 97 System.getProperty("flys.seddb.password", "seddb"); |
| 113 "flys.seddb.connection.init.sqls"); | 116 "flys.seddb.connection.init.sqls"); |
| 114 | 117 |
| 115 public static final String DEFAULT_VALIDATION_QUERY = | 118 public static final String DEFAULT_VALIDATION_QUERY = |
| 116 System.getProperty( | 119 System.getProperty( |
| 117 "flys.seddb.connection.validation.query"); | 120 "flys.seddb.connection.validation.query"); |
| 121 | |
| 122 public static final String DEFAULT_MAX_WAIT = | |
| 123 System.getProperty("flys.seddb.connection.max.wait"); | |
| 118 | 124 |
| 119 public static final Class [] CLASSES = { | 125 public static final Class [] CLASSES = { |
| 120 BezugspegelgewId.class, | 126 BezugspegelgewId.class, |
| 121 Bezugspegelgew.class, | 127 Bezugspegelgew.class, |
| 122 Bezugspegel.class, | 128 Bezugspegel.class, |
| 181 String password, | 187 String password, |
| 182 String dialect, | 188 String dialect, |
| 183 String driver, | 189 String driver, |
| 184 String url, | 190 String url, |
| 185 String connectionInitSqls, | 191 String connectionInitSqls, |
| 186 String validationQuery | 192 String validationQuery, |
| 193 String maxWait | |
| 187 ) { | 194 ) { |
| 188 super( | 195 super( |
| 189 user, password, dialect, driver, url, | 196 user, password, dialect, driver, url, |
| 190 connectionInitSqls, validationQuery, CLASSES); | 197 connectionInitSqls, validationQuery, maxWait, CLASSES); |
| 191 } | 198 } |
| 192 | 199 |
| 193 public static synchronized Credentials getInstance() { | 200 public static synchronized Credentials getInstance() { |
| 194 if (instance == null) { | 201 if (instance == null) { |
| 195 String user = | 202 String user = |
| 208 DEFAULT_CONNECTION_INIT_SQLS); | 215 DEFAULT_CONNECTION_INIT_SQLS); |
| 209 String validationQuery = | 216 String validationQuery = |
| 210 Config.getStringXPath( | 217 Config.getStringXPath( |
| 211 XPATH_VALIDATION_QUERY, | 218 XPATH_VALIDATION_QUERY, |
| 212 DEFAULT_VALIDATION_QUERY); | 219 DEFAULT_VALIDATION_QUERY); |
| 220 String maxWait = | |
| 221 Config.getStringXPath(XPATH_MAX_WAIT, DEFAULT_MAX_WAIT); | |
| 213 | 222 |
| 214 instance = new SedDBCredentials( | 223 instance = new SedDBCredentials( |
| 215 user, password, dialect, driver, url, | 224 user, password, dialect, driver, url, |
| 216 connectionInitSqls, validationQuery); | 225 connectionInitSqls, validationQuery, maxWait); |
| 217 } | 226 } |
| 218 return instance; | 227 return instance; |
| 219 } | 228 } |
| 220 | 229 |
| 221 public static Credentials getDefault() { | 230 public static Credentials getDefault() { |
| 224 DEFAULT_PASSWORD, | 233 DEFAULT_PASSWORD, |
| 225 DEFAULT_DIALECT, | 234 DEFAULT_DIALECT, |
| 226 DEFAULT_DRIVER, | 235 DEFAULT_DRIVER, |
| 227 DEFAULT_URL, | 236 DEFAULT_URL, |
| 228 DEFAULT_CONNECTION_INIT_SQLS, | 237 DEFAULT_CONNECTION_INIT_SQLS, |
| 229 DEFAULT_VALIDATION_QUERY); | 238 DEFAULT_VALIDATION_QUERY, |
| 239 DEFAULT_MAX_WAIT | |
| 240 ); | |
| 230 } | 241 } |
| 231 } | 242 } |
| 232 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : | 243 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |