Author: bpoussin Date: 2010-12-11 04:48:24 +0100 (Sat, 11 Dec 2010) New Revision: 602 Url: http://nuiton.org/repositories/revision/wikitty/602 Log: fix bug in configuration load sequence Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java 2010-12-11 03:03:58 UTC (rev 601) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java 2010-12-11 03:48:24 UTC (rev 602) @@ -248,26 +248,22 @@ String filename = String.format(patternConfigFilename, "default"); log.info(String.format("Try to load config file '%s'", filename)); ApplicationConfig wsConfigDefault; - try { - wsConfigDefault = new ApplicationConfig(filename); - // change juste data dir with context path - String dataDir = wsConfigDefault.getOption( - WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.getKey()); - wsConfigDefault.setOption( - WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.getKey(), - dataDir + File.separator + wsContext); - } catch (ArgumentsParserException eee) { - throw new WikittyException(String.format( - "Can't parse configuration %s", filename), eee); - } + wsConfigDefault = new WikittyConfig(filename); + // change juste data dir with context path + String dataDir = wsConfigDefault.getOption( + WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.getKey()); + wsConfigDefault.setOption( + WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.getKey(), + dataDir + File.separator + wsContext); + // read specifique configuration with default config as default properties filename = String.format(patternConfigFilename, wsContext); log.info(String.format("Try to load config file '%s'", filename)); ApplicationConfig wsConfig; try { - wsConfig = new ApplicationConfig(wsConfigDefault.getFlatOptions()); + wsConfig = new ApplicationConfig(wsConfigDefault.getFlatOptions(false)); wsConfig.setConfigFileName(filename); wsConfig.parse(null); } catch (ArgumentsParserException eee) {