Author: chatellier Date: 2011-02-04 13:33:27 +0000 (Fri, 04 Feb 2011) New Revision: 684 Log: Add context name for multiple deployment Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java 2011-02-04 13:31:04 UTC (rev 683) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java 2011-02-04 13:33:27 UTC (rev 684) @@ -85,7 +85,7 @@ /** Context name for multiple deployment. */ CONTEXT_NAME(APP_NAME, null, "coser"), - CONFIG_FILE(CONFIG_FILE_NAME, _("coser.config.config.file.description"), "coserweb.properties"), + CONFIG_FILE(CONTEXT_NAME.defaultValue + "." + CONFIG_FILE_NAME, _("coser.config.config.file.description"), "coserweb.properties"), APPLICATION_VERSION("coser.application.version", _("coser.config.application.version.description"), null), ADMIN_EMAIL("coser.admin.email", _("coser.config.config.file.description"), "harmonie at ifremer.fr"), ADMIN_LOGIN("coser.admin.login", _("coser.config.admin.login.description"), null),