Author: echatellier Date: 2014-07-09 14:55:59 +0200 (Wed, 09 Jul 2014) New Revision: 374 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/374 Log: Test load config with application context (impossible in this application) Remove static code. Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java 2014-07-09 12:54:53 UTC (rev 373) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java 2014-07-09 12:55:59 UTC (rev 374) @@ -38,27 +38,23 @@ import java.io.File; +import javax.servlet.ServletContext; + public class FaxToMailApplicationContext { private static Log log = LogFactory.getLog(FaxToMailApplicationContext.class); public static final String APPLICATION_CONTEXT_PARAMETER = "faxToMailApplicationContext"; - protected static FaxToMailTopiaApplicationContext topiaApplicationContext; + protected FaxToMailTopiaApplicationContext topiaApplicationContext; - protected static FaxToMailConfiguration applicationConfig; - - public static FaxToMailConfiguration getApplicationConfig() { - if (applicationConfig == null) { - applicationConfig = new FaxToMailConfiguration("faxToMail.properties"); - } + protected FaxToMailConfiguration applicationConfig; + + public FaxToMailConfiguration getApplicationConfig() { return applicationConfig; } - public static FaxToMailTopiaApplicationContext getTopiaApplicationContext() { - if (topiaApplicationContext == null) { - topiaApplicationContext = new FaxToMailTopiaApplicationContext(getApplicationConfig().getTopiaProperties()); - } + public FaxToMailTopiaApplicationContext getTopiaApplicationContext() { return topiaApplicationContext; } @@ -96,8 +92,11 @@ } } - public void init() { + public void init(ServletContext servletContext) { + applicationConfig = new FaxToMailConfiguration("faxToMail.properties"); + topiaApplicationContext = new FaxToMailTopiaApplicationContext(applicationConfig.getTopiaProperties()); + if (getApplicationConfig().isLogConfigurationProvided()) { File log4jConfigurationFile = getApplicationConfig().getLogConfigurationFile(); Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-07-09 12:54:53 UTC (rev 373) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-07-09 12:55:59 UTC (rev 374) @@ -24,13 +24,10 @@ * #L% */ +import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import com.franciaflex.faxtomail.web.job.ClientUpdateJob; -import com.franciaflex.faxtomail.web.job.EDIManagementJob; -import com.franciaflex.faxtomail.web.job.MailFilterJob; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.quartz.CronScheduleBuilder; @@ -45,8 +42,9 @@ import com.franciaflex.faxtomail.FaxToMailApplicationContext; import com.franciaflex.faxtomail.FaxToMailConfiguration; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; -import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.web.job.ClientUpdateJob; +import com.franciaflex.faxtomail.web.job.EDIManagementJob; +import com.franciaflex.faxtomail.web.job.MailFilterJob; public class FaxToMailApplicationListener implements ServletContextListener { @@ -65,15 +63,15 @@ log.debug("scheduler launched"); + ServletContext sc = sce.getServletContext(); applicationContext = new FaxToMailApplicationContext(); + applicationContext.init(sc); - applicationContext.init(); - sce.getServletContext().setAttribute( FaxToMailApplicationContext.APPLICATION_CONTEXT_PARAMETER, applicationContext); - FaxToMailConfiguration config = FaxToMailApplicationContext.getApplicationConfig(); + FaxToMailConfiguration config = applicationContext.getApplicationConfig(); JobDataMap data = new JobDataMap();