Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/backend/FLYSCredentials.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 | 6d8d7425a6b5 |
comparison
equal
deleted
inserted
replaced
| 8484:8c615d738e84 | 8485:026f4c684ee5 |
|---|---|
| 109 "/artifact-database/backend-database/connection-init-sqls/text()"; | 109 "/artifact-database/backend-database/connection-init-sqls/text()"; |
| 110 | 110 |
| 111 public static final String XPATH_VALIDATION_QUERY = | 111 public static final String XPATH_VALIDATION_QUERY = |
| 112 "/artifact-database/backend-database/validation-query/text()"; | 112 "/artifact-database/backend-database/validation-query/text()"; |
| 113 | 113 |
| 114 public static final String XPATH_MAX_WAIT = | |
| 115 "/artifact-database/backend-database/max-wait/text()"; | |
| 116 | |
| 114 public static final String DEFAULT_USER = | 117 public static final String DEFAULT_USER = |
| 115 System.getProperty("flys.backend.user", "flys"); | 118 System.getProperty("flys.backend.user", "flys"); |
| 116 | 119 |
| 117 public static final String DEFAULT_PASSWORD = | 120 public static final String DEFAULT_PASSWORD = |
| 118 System.getProperty("flys.backend.password", "flys"); | 121 System.getProperty("flys.backend.password", "flys"); |
| 137 "flys.backend.connection.init.sqls"); | 140 "flys.backend.connection.init.sqls"); |
| 138 | 141 |
| 139 public static final String DEFAULT_VALIDATION_QUERY = | 142 public static final String DEFAULT_VALIDATION_QUERY = |
| 140 System.getProperty( | 143 System.getProperty( |
| 141 "flys.backend.connection.validation.query"); | 144 "flys.backend.connection.validation.query"); |
| 145 | |
| 146 public static final String DEFAULT_MAX_WAIT = | |
| 147 System.getProperty("flys.backend.connection.max.wait"); | |
| 142 | 148 |
| 143 public static final Class [] CLASSES = { | 149 public static final Class [] CLASSES = { |
| 144 Annotation.class, | 150 Annotation.class, |
| 145 AnnotationType.class, | 151 AnnotationType.class, |
| 146 Attribute.class, | 152 Attribute.class, |
| 227 String password, | 233 String password, |
| 228 String dialect, | 234 String dialect, |
| 229 String driver, | 235 String driver, |
| 230 String url, | 236 String url, |
| 231 String connectionInitSqls, | 237 String connectionInitSqls, |
| 232 String validationQuery | 238 String validationQuery, |
| 239 String maxWait | |
| 233 ) { | 240 ) { |
| 234 super( | 241 super( |
| 235 user, password, dialect, driver, url, | 242 user, password, dialect, driver, url, |
| 236 connectionInitSqls, validationQuery, CLASSES); | 243 connectionInitSqls, validationQuery, maxWait, CLASSES); |
| 237 } | 244 } |
| 238 | 245 |
| 239 private static Credentials instance; | 246 private static Credentials instance; |
| 240 | 247 |
| 241 public static synchronized Credentials getInstance() { | 248 public static synchronized Credentials getInstance() { |
| 256 DEFAULT_CONNECTION_INIT_SQLS); | 263 DEFAULT_CONNECTION_INIT_SQLS); |
| 257 String validationQuery = | 264 String validationQuery = |
| 258 Config.getStringXPath( | 265 Config.getStringXPath( |
| 259 XPATH_VALIDATION_QUERY, | 266 XPATH_VALIDATION_QUERY, |
| 260 DEFAULT_VALIDATION_QUERY); | 267 DEFAULT_VALIDATION_QUERY); |
| 268 String maxWait = | |
| 269 Config.getStringXPath(XPATH_MAX_WAIT, DEFAULT_MAX_WAIT); | |
| 261 | 270 |
| 262 instance = new FLYSCredentials( | 271 instance = new FLYSCredentials( |
| 263 user, password, dialect, driver, url, connectionInitSqls, validationQuery); | 272 user, password, dialect, driver, url, connectionInitSqls, |
| 273 validationQuery, maxWait); | |
| 264 } | 274 } |
| 265 return instance; | 275 return instance; |
| 266 } | 276 } |
| 267 | 277 |
| 268 public static Credentials getDefault() { | 278 public static Credentials getDefault() { |
| 271 DEFAULT_PASSWORD, | 281 DEFAULT_PASSWORD, |
| 272 DEFAULT_DIALECT, | 282 DEFAULT_DIALECT, |
| 273 DEFAULT_DRIVER, | 283 DEFAULT_DRIVER, |
| 274 DEFAULT_URL, | 284 DEFAULT_URL, |
| 275 DEFAULT_CONNECTION_INIT_SQLS, | 285 DEFAULT_CONNECTION_INIT_SQLS, |
| 276 DEFAULT_VALIDATION_QUERY); | 286 DEFAULT_VALIDATION_QUERY, |
| 287 DEFAULT_MAX_WAIT | |
| 288 ); | |
| 277 } | 289 } |
| 278 } | 290 } |
| 279 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : | 291 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |