Author: bleny Date: 2013-07-04 15:33:58 +0200 (Thu, 04 Jul 2013) New Revision: 287 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: create an init method in MagalieApplicationContext, remove fixtures loading from Interceptor Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 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-04 13:26:41 UTC (rev 286) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java 2013-07-04 13:33:58 UTC (rev 287) @@ -27,6 +27,7 @@ import com.franciaflex.magalie.persistence.JpaMagaliePersistenceContext; import com.franciaflex.magalie.services.DefaultMagalieServiceContext; import com.franciaflex.magalie.services.MagalieServiceContext; +import com.franciaflex.magalie.services.service.FixturesService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -121,4 +122,28 @@ } + public void init() { + + if (getMagalieApplicationConfig().isDevMode()) { + + if (log.isInfoEnabled()) { + log.info("devMode is enabled, loading fixtures set"); + } + + EntityManager entityManager = newEntityManager(); + + MagalieServiceContext serviceContext = + newServiceContext(entityManager); + + FixturesService fixturesService = + serviceContext.newService(FixturesService.class); + + fixturesService.cleanDatabaseAndLoadFixtures("fixtures"); + + entityManager.close(); + + } + + } + } 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-04 13:26:41 UTC (rev 286) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java 2013-07-04 13:33:58 UTC (rev 287) @@ -48,6 +48,8 @@ MagalieApplicationContext.APPLICATION_CONTEXT_PARAMETER, applicationContext); + applicationContext.init(); + } @Override Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-07-04 13:26:41 UTC (rev 286) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-07-04 13:33:58 UTC (rev 287) @@ -26,7 +26,6 @@ import com.franciaflex.magalie.MagalieApplicationConfig; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; -import com.franciaflex.magalie.services.service.FixturesService; import com.franciaflex.magalie.web.action.ChooseCompanyAction; import com.franciaflex.magalie.web.action.IndexAction; import com.franciaflex.magalie.web.action.LoginAction; @@ -57,8 +56,6 @@ private static final Log log = LogFactory.getLog(MagalieInterceptor.class); - protected boolean fixturesLoaded = false; - @Override public void init() { @@ -75,18 +72,6 @@ if (action instanceof MagalieActionSupport) { - MagalieServiceContext serviceContext = newServiceContext(invocation); - - if ( ! fixturesLoaded && serviceContext.getMagalieApplicationConfig().isDevMode()) { - - FixturesService fixturesService = serviceContext.newService(FixturesService.class); - - fixturesService.cleanDatabaseAndLoadFixtures("fixtures"); - - fixturesLoaded = true; - - } - MagalieSession magalieSession = getMagalieSession(invocation); if (CollectionUtils.isNotEmpty(magalieSession.getMessages())) { @@ -108,6 +93,8 @@ actionClass, BeanUtil.IS_WRITE_DESCRIPTOR); + MagalieServiceContext serviceContext = newServiceContext(invocation); + for (PropertyDescriptor propertyDescriptor : descriptors) { Class<?> propertyType = propertyDescriptor.getPropertyType();