Author: bleny Date: 2014-07-09 14:21:01 +0200 (Wed, 09 Jul 2014) New Revision: 2138 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2138 Log: refs #5375 fix issue after defining applicationconfig app name Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java 2014-07-09 10:20:30 UTC (rev 2137) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java 2014-07-09 12:21:01 UTC (rev 2138) @@ -41,9 +41,16 @@ protected ApplicationConfig applicationConfig; public WaoApplicationConfig() { + applicationConfig = new ApplicationConfig(); + + // to allow using wao.config.path environment variable + applicationConfig.setAppName("wao"); + + // XXX brendan 09/07/14 need to fix encoding whe using setAppName + applicationConfig.setEncoding("UTF-8"); + applicationConfig.loadDefaultOptions(WaoApplicationConfigOption.values()); - applicationConfig.setAppName("wao"); applicationConfig.setConfigFileName("wao.properties"); try { applicationConfig.parse();