Author: bleny Date: 2013-07-23 13:51:55 +0200 (Tue, 23 Jul 2013) New Revision: 322 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: enable reading another property file for configuration Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-07-23 11:50:57 UTC (rev 321) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-07-23 11:51:55 UTC (rev 322) @@ -44,12 +44,20 @@ protected ApplicationConfig applicationConfig; - protected ImmutableMap<String,String> oracleCompatibilityModeJpaParameters; + protected ImmutableMap<String, String> oracleCompatibilityModeJpaParameters; public MagalieApplicationConfig() { + this("magalie"); + } + + public MagalieApplicationConfig(String contextPath) { applicationConfig = new ApplicationConfig(); applicationConfig.loadDefaultOptions(MagalieConfigOption.values()); - applicationConfig.setConfigFileName("magalie.properties"); + String configFileName = contextPath + ".properties"; + if (log.isDebugEnabled()) { + log.debug("will read file config file name " + configFileName); + } + applicationConfig.setConfigFileName(configFileName); try { applicationConfig.parse(); } catch (ArgumentsParserException e) { Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java 2013-07-23 11:50:57 UTC (rev 321) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java 2013-07-23 11:51:55 UTC (rev 322) @@ -47,9 +47,15 @@ protected EntityManagerFactory entityManagerFactory; + protected String contextPath; + + public MagalieApplicationContext(String contextPath) { + this.contextPath = contextPath; + } + public MagalieApplicationConfig getMagalieApplicationConfig() { if (applicationConfig == null) { - applicationConfig = new MagalieApplicationConfig(); + applicationConfig = new MagalieApplicationConfig(contextPath); } return applicationConfig; } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java 2013-07-23 11:50:57 UTC (rev 321) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java 2013-07-23 11:51:55 UTC (rev 322) @@ -38,11 +38,13 @@ @Override public void contextInitialized(ServletContextEvent sce) { + String contextPath = sce.getServletContext().getContextPath().replace("/", ""); + if (log.isInfoEnabled()) { - log.info("init MagaLiE"); + log.info("init MagaLiE for context path '" + contextPath + "'"); } - applicationContext = new MagalieApplicationContext(); + applicationContext = new MagalieApplicationContext(contextPath); sce.getServletContext().setAttribute( MagalieApplicationContext.APPLICATION_CONTEXT_PARAMETER,