- Franciaflex-magalie-commits - mailman.cloud.codelutin.com

r67 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa magalie-services/src/main/java/com/franciaflex/magalie/services magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 03 Apr '13

03 Apr '13

Author: bleny Date: 2013-04-03 12:20:27 +0200 (Wed, 03 Apr 2013) New Revision: 67 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: manually deal with transaction management Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-04-03 10:20:27 UTC (rev 67) @@ -0,0 +1,88 @@ +package com.franciaflex.magalie.persistence; + +import com.franciaflex.magalie.persistence.dao.ArticleDao; +import com.franciaflex.magalie.persistence.dao.MagalieUserDao; +import com.franciaflex.magalie.persistence.dao.RequestedArticleDao; +import com.franciaflex.magalie.persistence.dao.SiteDao; +import com.franciaflex.magalie.persistence.dao.SiteErrorDao; +import com.franciaflex.magalie.persistence.dao.StorageMovementDao; +import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao; +import com.franciaflex.magalie.persistence.dao.StoredArticleDao; +import com.franciaflex.magalie.persistence.dao.jpa.ArticleJpaDao; +import com.franciaflex.magalie.persistence.dao.jpa.MagalieUserJpaDao; +import com.franciaflex.magalie.persistence.dao.jpa.RequestedArticleJpaDao; +import com.franciaflex.magalie.persistence.dao.jpa.SiteErrorJpaDao; +import com.franciaflex.magalie.persistence.dao.jpa.SiteJpaDao; +import com.franciaflex.magalie.persistence.dao.jpa.StorageMovementJpaDao; +import com.franciaflex.magalie.persistence.dao.jpa.StorageMovementOrderJpaDao; +import com.franciaflex.magalie.persistence.dao.jpa.StoredArticleJpaDao; + +import javax.persistence.EntityManager; +import javax.persistence.EntityTransaction; + +public class JpaMagaliePersistenceContext implements MagaliePersistenceContext { + + protected EntityManager entityManager; + + protected EntityTransaction entityTransaction; + + public JpaMagaliePersistenceContext(EntityManager entityManager) { + this.entityManager = entityManager; + entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + } + + @Override + public MagalieUserDao getMagalieUserDao() { + return new MagalieUserJpaDao(entityManager); + } + + @Override + public StoredArticleDao getStoredArticleDao() { + return new StoredArticleJpaDao(entityManager); + } + + @Override + public RequestedArticleDao getRequestedArticleDao() { + return new RequestedArticleJpaDao(entityManager); + } + + @Override + public ArticleDao getArticleDao() { + return new ArticleJpaDao(entityManager); + } + + @Override + public StorageMovementDao getStorageMovementDao() { + return new StorageMovementJpaDao(entityManager); + } + + @Override + public SiteErrorDao getSiteErrorDao() { + return new SiteErrorJpaDao(entityManager); + } + + @Override + public StorageMovementOrderDao getStorageMovementOrderDao() { + return new StorageMovementOrderJpaDao(entityManager); + } + + @Override + public SiteDao getSiteDao() { + return new SiteJpaDao(entityManager); + } + + @Override + public void commit() { + entityTransaction.commit(); + entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + } + + @Override + public void rollback() { + entityTransaction.rollback(); + entityTransaction = entityManager.getTransaction(); + entityTransaction.begin(); + } +} Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java 2013-04-03 10:20:27 UTC (rev 67) @@ -0,0 +1,37 @@ +package com.franciaflex.magalie.persistence; + +import com.franciaflex.magalie.persistence.dao.ArticleDao; +import com.franciaflex.magalie.persistence.dao.MagalieUserDao; +import com.franciaflex.magalie.persistence.dao.RequestedArticleDao; +import com.franciaflex.magalie.persistence.dao.SiteDao; +import com.franciaflex.magalie.persistence.dao.SiteErrorDao; +import com.franciaflex.magalie.persistence.dao.StorageMovementDao; +import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao; +import com.franciaflex.magalie.persistence.dao.StoredArticleDao; + +/** + * @author bleny + */ +public interface MagaliePersistenceContext { + + MagalieUserDao getMagalieUserDao(); + + StoredArticleDao getStoredArticleDao(); + + RequestedArticleDao getRequestedArticleDao(); + + ArticleDao getArticleDao(); + + StorageMovementDao getStorageMovementDao(); + + SiteErrorDao getSiteErrorDao(); + + StorageMovementOrderDao getStorageMovementOrderDao(); + + SiteDao getSiteDao(); + + void commit(); + + void rollback(); + +} Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java 2013-04-02 16:11:50 UTC (rev 66) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java 2013-04-03 10:20:27 UTC (rev 67) @@ -4,7 +4,6 @@ import com.franciaflex.magalie.persistence.entity.AbstractEntity; import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; public abstract class AbstractJpaDao<E extends AbstractEntity> implements Dao<E> { @@ -24,18 +23,12 @@ @Override public void persist(E entity) { - EntityTransaction transaction = entityManager.getTransaction(); - transaction.begin(); entityManager.persist(entity); - transaction.commit(); } @Override public E merge(E entity) { - EntityTransaction transaction = entityManager.getTransaction(); - transaction.begin(); E merge = entityManager.merge(entity); - transaction.commit(); return merge; } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-04-02 16:11:50 UTC (rev 66) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-04-03 10:20:27 UTC (rev 67) @@ -2,6 +2,8 @@ import com.franciaflex.magalie.MagalieApplicationConfig; import com.franciaflex.magalie.MagalieTechnicalException; +import com.franciaflex.magalie.persistence.JpaMagaliePersistenceContext; +import com.franciaflex.magalie.persistence.MagaliePersistenceContext; import com.franciaflex.magalie.persistence.dao.ArticleDao; import com.franciaflex.magalie.persistence.dao.MagalieUserDao; import com.franciaflex.magalie.persistence.dao.RequestedArticleDao; @@ -10,14 +12,6 @@ import com.franciaflex.magalie.persistence.dao.StorageMovementDao; import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao; import com.franciaflex.magalie.persistence.dao.StoredArticleDao; -import com.franciaflex.magalie.persistence.dao.jpa.ArticleJpaDao; -import com.franciaflex.magalie.persistence.dao.jpa.MagalieUserJpaDao; -import com.franciaflex.magalie.persistence.dao.jpa.RequestedArticleJpaDao; -import com.franciaflex.magalie.persistence.dao.jpa.SiteErrorJpaDao; -import com.franciaflex.magalie.persistence.dao.jpa.SiteJpaDao; -import com.franciaflex.magalie.persistence.dao.jpa.StorageMovementJpaDao; -import com.franciaflex.magalie.persistence.dao.jpa.StorageMovementOrderJpaDao; -import com.franciaflex.magalie.persistence.dao.jpa.StoredArticleJpaDao; import javax.persistence.EntityManager; import java.lang.reflect.Constructor; @@ -30,6 +24,8 @@ protected MagalieApplicationConfig magalieApplicationConfig; + protected MagaliePersistenceContext persistenceContext; + public void setEntityManager(EntityManager entityManager) { this.entityManager = entityManager; } @@ -89,42 +85,50 @@ } @Override + public MagaliePersistenceContext getPersistenceContext() { + if (persistenceContext == null) { + persistenceContext = new JpaMagaliePersistenceContext(entityManager); + } + return persistenceContext; + } + + @Override public MagalieUserDao getMagalieUserDao() { - return new MagalieUserJpaDao(entityManager); + return getPersistenceContext().getMagalieUserDao(); } @Override public StoredArticleDao getStoredArticleDao() { - return new StoredArticleJpaDao(entityManager); + return getPersistenceContext().getStoredArticleDao(); } @Override public RequestedArticleDao getRequestedArticleDao() { - return new RequestedArticleJpaDao(entityManager); + return getPersistenceContext().getRequestedArticleDao(); } @Override public ArticleDao getArticleDao() { - return new ArticleJpaDao(entityManager); + return getPersistenceContext().getArticleDao(); } @Override public StorageMovementDao getStorageMovementDao() { - return new StorageMovementJpaDao(entityManager); + return getPersistenceContext().getStorageMovementDao(); } @Override public SiteErrorDao getSiteErrorDao() { - return new SiteErrorJpaDao(entityManager); + return getPersistenceContext().getSiteErrorDao(); } @Override public StorageMovementOrderDao getStorageMovementOrderDao() { - return new StorageMovementOrderJpaDao(entityManager); + return getPersistenceContext().getStorageMovementOrderDao(); } @Override public SiteDao getSiteDao() { - return new SiteJpaDao(entityManager); + return getPersistenceContext().getSiteDao(); } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java 2013-04-02 16:11:50 UTC (rev 66) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java 2013-04-03 10:20:27 UTC (rev 67) @@ -24,6 +24,7 @@ */ import com.franciaflex.magalie.MagalieApplicationConfig; +import com.franciaflex.magalie.persistence.MagaliePersistenceContext; import com.franciaflex.magalie.persistence.dao.ArticleDao; import com.franciaflex.magalie.persistence.dao.MagalieUserDao; import com.franciaflex.magalie.persistence.dao.RequestedArticleDao; @@ -44,6 +45,8 @@ <E extends MagalieService> E newService(Class<E> serviceClass); + MagaliePersistenceContext getPersistenceContext(); + MagalieUserDao getMagalieUserDao(); StoredArticleDao getStoredArticleDao(); Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-04-02 16:11:50 UTC (rev 66) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-04-03 10:20:27 UTC (rev 67) @@ -1,5 +1,6 @@ package com.franciaflex.magalie.services.service; +import com.franciaflex.magalie.persistence.MagaliePersistenceContext; import com.franciaflex.magalie.persistence.StoredArticles; import com.franciaflex.magalie.persistence.dao.SiteDao; import com.franciaflex.magalie.persistence.dao.StorageMovementDao; @@ -131,10 +132,14 @@ } - StorageMovementOrderDao dao = serviceContext.getStorageMovementOrderDao(); + MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); + StorageMovementOrderDao dao = persistenceContext.getStorageMovementOrderDao(); + dao.persist(storageMovementOrder); + persistenceContext.commit(); + return storageMovementOrder; } @@ -340,5 +345,7 @@ storageMovementOrderDao.merge(storageMovementOrder); + serviceContext.getPersistenceContext().commit(); + } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-04-02 16:11:50 UTC (rev 66) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-04-03 10:20:27 UTC (rev 67) @@ -51,8 +51,12 @@ EntityManager entityManager = ((DefaultMagalieServiceContext) serviceContext).getEntityManager(); + // serviceContext.getPersistenceContext(); + JpaUtil.cleanDatabase(entityManager); + serviceContext.getPersistenceContext().commit(); + MagalieUserDao magalieUserDao = serviceContext.getMagalieUserDao(); Collection<MagalieUser> users = fixtures.fixture("users"); @@ -63,6 +67,8 @@ } + serviceContext.getPersistenceContext().commit(); + SiteDao siteDao = serviceContext.getSiteDao(); Collection<Site> sites = fixtures.fixture("sites"); @@ -73,16 +79,20 @@ } + serviceContext.getPersistenceContext().commit(); + ArticleDao articleDao = serviceContext.getArticleDao(); Collection<Article> articles = fixtures.fixture("articles"); for (Article article : articles) { - articleDao.persist(article); + articleDao.merge(article); } + serviceContext.getPersistenceContext().commit(); + StoredArticleDao storedArticleDao = serviceContext.getStoredArticleDao(); Collection<StoredArticle> storedArticles = fixtures.fixture("storedArticles"); @@ -93,6 +103,8 @@ } + serviceContext.getPersistenceContext().commit(); + } else { if (log.isWarnEnabled()) { Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java 2013-04-02 16:11:50 UTC (rev 66) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java 2013-04-03 10:20:27 UTC (rev 67) @@ -49,6 +49,8 @@ siteErrorDao.persist(newSiteError); + serviceContext.getPersistenceContext().commit(); + } else { if (log.isInfoEnabled()) {

1 0

r66 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 02 Apr '13

02 Apr '13

Author: bleny Date: 2013-04-02 18:11:50 +0200 (Tue, 02 Apr 2013) New Revision: 66 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add message when restoring fixtures Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-04-02 14:09:40 UTC (rev 65) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-04-02 16:11:50 UTC (rev 66) @@ -21,6 +21,8 @@ service.loadFixtures(); + addActionMessage("Jeu de données initial restauré"); + return SUCCESS; }

1 0

r65 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/test/java/com/franciaflex/magalie/services/service magalie-web/src/main/java/com/franciaflex/magalie/web/action magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 02 Apr '13

02 Apr '13

Author: bleny Date: 2013-04-02 16:09:40 +0200 (Tue, 02 Apr 2013) New Revision: 65 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: in report add a way to restore fixtures Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaUtil.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedItemServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaUtil.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaUtil.java 2013-03-29 17:22:11 UTC (rev 64) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaUtil.java 2013-04-02 14:09:40 UTC (rev 65) @@ -5,12 +5,19 @@ import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.ejb.AvailableSettings; +import org.hibernate.ejb.EntityManagerFactoryImpl; +import org.hibernate.service.ServiceRegistry; +import org.hibernate.service.internal.SessionFactoryServiceRegistryImpl; +import org.hibernate.tool.hbm2ddl.SchemaExport; +import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; import java.io.File; +import java.lang.reflect.Field; import java.util.Collections; import java.util.Map; @@ -18,8 +25,6 @@ private static final Log log = LogFactory.getLog(JpaUtil.class); - private JpaUtil() {} - protected static final ImmutableMap<String, String> JPA_H2_CONFIG = ImmutableMap.of( AvailableSettings.JDBC_DRIVER, org.h2.Driver.class.getName(), @@ -29,6 +34,8 @@ Environment.HBM2DDL_AUTO, "create" ); + private JpaUtil() {} + public static EntityManagerFactory createTempEntityManagerFactory(String persistenceUnitName, String context) { EntityManagerFactory tempEntityManagerFactory = @@ -70,4 +77,40 @@ } + public static void cleanDatabase(EntityManager entityManager) { + + if (log.isInfoEnabled()) { + log.info("will clean database"); + } + + ServiceRegistry serviceRegistry = + ((EntityManagerFactoryImpl) entityManager.getEntityManagerFactory()) + .getSessionFactory().getServiceRegistry(); + + Configuration configuration = null; + try { + Field configurationField = SessionFactoryServiceRegistryImpl.class.getDeclaredField("configuration"); + configurationField.setAccessible(true); + configuration = (Configuration) configurationField.get(serviceRegistry); + } catch (IllegalAccessException e) { + if (log.isErrorEnabled()) { + log.error("should not occur", e); + } + } catch (NoSuchFieldException e) { + if (log.isErrorEnabled()) { + log.error("should not occur", e); + } + } + + SchemaExport schemaExport= new SchemaExport(serviceRegistry, configuration); + + schemaExport.setHaltOnError(true); + + // drop + schemaExport.execute(true, true, true, false); + + // create + schemaExport.execute(true, true, false, true); + + } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-03-29 17:22:11 UTC (rev 64) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-04-02 14:09:40 UTC (rev 65) @@ -1,5 +1,6 @@ package com.franciaflex.magalie.services.service; +import com.franciaflex.magalie.persistence.JpaUtil; import com.franciaflex.magalie.persistence.dao.ArticleDao; import com.franciaflex.magalie.persistence.dao.MagalieUserDao; import com.franciaflex.magalie.persistence.dao.SiteDao; @@ -12,7 +13,6 @@ import com.franciaflex.magalie.services.MagalieFixtures; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; -import com.google.common.collect.Iterables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -51,65 +51,46 @@ EntityManager entityManager = ((DefaultMagalieServiceContext) serviceContext).getEntityManager(); -// entityManager. -// MetadataImplementor getDatabase -// ull; -// try { -// conn = getConnection(); -// metadata = new DatabaseMetadata(conn, dialect); -// DROP_SCRIPTS = config.generateDropSchemaScript(dialect); -// CREATE_SCRIPTS = config.generateSchemaCreationScript(dialect); -// } finally { -// close(conn); -// } + JpaUtil.cleanDatabase(entityManager); -// ((org.hibernate.service.internal.SessionFactoryServiceRegistryImpl) ((org.hibernate.ejb.EntityManagerFactoryImpl) entityManager.getEntityManagerFactory()).getSessionFactory().getServiceRegistry()) -// -// ((SessionImpl) entityManager.getDelegate()).get - MagalieUserDao magalieUserDao = serviceContext.getMagalieUserDao(); Collection<MagalieUser> users = fixtures.fixture("users"); - boolean alreadyLoaded = magalieUserDao.findById(Iterables.get(users, 0).getId()) != null; + for (MagalieUser user : users) { - if ( ! alreadyLoaded) { + magalieUserDao.persist(user); - for (MagalieUser user : users) { + } - magalieUserDao.persist(user); + SiteDao siteDao = serviceContext.getSiteDao(); - } + Collection<Site> sites = fixtures.fixture("sites"); - SiteDao siteDao = serviceContext.getSiteDao(); + for (Site site : sites) { - Collection<Site> sites = fixtures.fixture("sites"); + siteDao.persist(site); - for (Site site : sites) { + } - siteDao.persist(site); + ArticleDao articleDao = serviceContext.getArticleDao(); - } + Collection<Article> articles = fixtures.fixture("articles"); - ArticleDao articleDao = serviceContext.getArticleDao(); + for (Article article : articles) { - Collection<Article> articles = fixtures.fixture("articles"); + articleDao.persist(article); - for (Article article : articles) { + } - articleDao.persist(article); + StoredArticleDao storedArticleDao = serviceContext.getStoredArticleDao(); - } + Collection<StoredArticle> storedArticles = fixtures.fixture("storedArticles"); - StoredArticleDao storedArticleDao = serviceContext.getStoredArticleDao(); + for (StoredArticle storedArticle : storedArticles) { - Collection<StoredArticle> storedArticles = fixtures.fixture("storedArticles"); + storedArticleDao.persist(storedArticle); - for (StoredArticle storedArticle : storedArticles) { - - storedArticleDao.persist(storedArticle); - - } } } else { Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedItemServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedItemServiceTest.java 2013-03-29 17:22:11 UTC (rev 64) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedItemServiceTest.java 2013-04-02 14:09:40 UTC (rev 65) @@ -1,9 +1,12 @@ package com.franciaflex.magalie.services.service; +import com.franciaflex.magalie.persistence.JpaUtil; +import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.services.AbstractMagalieServiceTest; import com.google.common.collect.Sets; import org.junit.Test; +import javax.persistence.EntityManager; import java.util.Comparator; import java.util.Set; @@ -29,4 +32,19 @@ System.out.println(doubles); } + + @Test + public void testName() throws Exception { + getServiceContext(); + + MagalieUser alexandre = fixture("alexandre"); + + EntityManager entityManager = serviceContext.getEntityManager(); + + JpaUtil.cleanDatabase(entityManager); + +// MagalieUser found = serviceContext.getMagalieUserDao().findById(alexandre.getId()); + +// Assert.assertNull(found); + } } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java 2013-03-29 17:22:11 UTC (rev 64) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java 2013-04-02 14:09:40 UTC (rev 65) @@ -1,5 +1,6 @@ package com.franciaflex.magalie.web.action; +import com.franciaflex.magalie.MagalieApplicationConfig; import com.franciaflex.magalie.services.MagalieReport; import com.franciaflex.magalie.services.service.ReportService; import com.franciaflex.magalie.web.MagalieActionSupport; @@ -10,10 +11,16 @@ protected MagalieReport report; + protected MagalieApplicationConfig config; + public void setService(ReportService service) { this.service = service; } + public void setConfig(MagalieApplicationConfig config) { + this.config = config; + } + @Override public String execute() { @@ -26,4 +33,8 @@ public MagalieReport getReport() { return report; } + + public boolean isDevMode() { + return config.isDevMode(); + } } Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java (rev 0) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-04-02 14:09:40 UTC (rev 65) @@ -0,0 +1,27 @@ +package com.franciaflex.magalie.web.action; + +import com.franciaflex.magalie.services.service.FixturesService; +import com.franciaflex.magalie.web.MagalieActionSupport; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; + +@Results({ + @Result(name="success", type="redirectAction", params = { "actionName", "report" }) +}) +public class RestoreFixturesAction extends MagalieActionSupport { + + protected FixturesService service; + + public void setService(FixturesService service) { + this.service = service; + } + + @Override + public String execute() throws Exception { + + service.loadFixtures(); + + return SUCCESS; + + } +} Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-03-29 17:22:11 UTC (rev 64) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-04-02 14:09:40 UTC (rev 65) @@ -245,4 +245,11 @@ </tbody> </table> -</section> \ No newline at end of file +</section> + +<s:if test="devMode"> + <p> + <s:url namespace="/" action="restore-fixtures" id="restoreFixturesUrl"/> + <s:a href="%{restoreFixturesUrl}">Restaurer le jeu de test de départ</s:a> + </p> +</s:if>

1 0

r64 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie
by bleny＠users.forge.codelutin.com 29 Mar '13

29 Mar '13

Author: bleny Date: 2013-03-29 18:22:11 +0100 (Fri, 29 Mar 2013) New Revision: 64 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove useless line return Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.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-03-29 17:12:01 UTC (rev 63) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-03-29 17:22:11 UTC (rev 64) @@ -34,7 +34,7 @@ option.getKey(), applicationConfig.getOption(option))); } - log.info("MagaLiE configuration:\n" + builder.toString()); + log.info("MagaLiE configuration:" + builder.toString()); } }

1 0

r63 - in trunk: . magalie-persistence/src/main/java/com/franciaflex/magalie magalie-services/src/main magalie-services/src/main/java/com/franciaflex/magalie/services magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/main/resources magalie-services/src/test/java/com/franciaflex/magalie/services magalie-services/src/test/resources magalie-web/src/main/java/com/franciaflex/magalie/web
by bleny＠users.forge.codelutin.com 29 Mar '13

29 Mar '13

Author: bleny Date: 2013-03-29 18:12:01 +0100 (Fri, 29 Mar 2013) New Revision: 63 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: makes fixtures a service in itself, load fixtures at application startup Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java trunk/magalie-services/src/main/resources/ trunk/magalie-services/src/main/resources/fixtures.yaml Removed: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/MagalieFixtures.java trunk/magalie-services/src/test/resources/fixtures.yaml Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java trunk/pom.xml Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-03-29 14:21:44 UTC (rev 62) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-03-29 17:12:01 UTC (rev 63) @@ -47,4 +47,8 @@ return jpaParameters; } + public boolean isDevMode() { + boolean isDevMode = applicationConfig.getOptionAsBoolean(MagalieConfigOption.DEV_MODE.key); + return isDevMode; + } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-03-29 14:21:44 UTC (rev 62) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-03-29 17:12:01 UTC (rev 63) @@ -34,6 +34,10 @@ this.entityManager = entityManager; } + public EntityManager getEntityManager() { + return entityManager; + } + @Override public MagalieApplicationConfig getMagalieApplicationConfig() { return magalieApplicationConfig; Copied: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java (from rev 40, trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/MagalieFixtures.java) =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java (rev 0) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-03-29 17:12:01 UTC (rev 63) @@ -0,0 +1,47 @@ +package com.franciaflex.magalie.services; + +import com.esotericsoftware.yamlbeans.YamlException; +import com.esotericsoftware.yamlbeans.YamlReader; +import com.franciaflex.magalie.MagalieTechnicalException; +import com.franciaflex.magalie.persistence.entity.Article; +import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.persistence.entity.RequestedArticle; +import com.franciaflex.magalie.persistence.entity.Site; +import com.franciaflex.magalie.persistence.entity.StoredArticle; +import org.apache.commons.io.Charsets; +import org.apache.commons.io.IOUtils; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Map; + +public class MagalieFixtures { + + protected Map<String, Object> fixtures; + + public MagalieFixtures(String fixturesName) { + String yamlPath = "/" + fixturesName + ".yaml"; + InputStream inputStream = MagalieFixtures.class.getResourceAsStream(yamlPath); + String yaml; + try { + yaml = IOUtils.toString(inputStream, Charsets.UTF_8); + } catch (IOException e) { + throw new IllegalArgumentException(fixturesName + " is not a valid fixtures set name", e); + } + YamlReader reader = new YamlReader(yaml); + reader.getConfig().setClassTag("article", Article.class); + reader.getConfig().setClassTag("stored-article", StoredArticle.class); + reader.getConfig().setClassTag("user", MagalieUser.class); + reader.getConfig().setClassTag("requested-article", RequestedArticle.class); + reader.getConfig().setClassTag("site", Site.class); + try { + fixtures = (Map<String, Object>) reader.read(); + } catch (YamlException e) { + throw new MagalieTechnicalException("unable to read yaml file", e); + } + } + + public <E> E fixture(String id) { + return (E) fixtures.get(id); + } +} Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java (rev 0) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-03-29 17:12:01 UTC (rev 63) @@ -0,0 +1,128 @@ +package com.franciaflex.magalie.services.service; + +import com.franciaflex.magalie.persistence.dao.ArticleDao; +import com.franciaflex.magalie.persistence.dao.MagalieUserDao; +import com.franciaflex.magalie.persistence.dao.SiteDao; +import com.franciaflex.magalie.persistence.dao.StoredArticleDao; +import com.franciaflex.magalie.persistence.entity.Article; +import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.persistence.entity.Site; +import com.franciaflex.magalie.persistence.entity.StoredArticle; +import com.franciaflex.magalie.services.DefaultMagalieServiceContext; +import com.franciaflex.magalie.services.MagalieFixtures; +import com.franciaflex.magalie.services.MagalieService; +import com.franciaflex.magalie.services.MagalieServiceContext; +import com.google.common.collect.Iterables; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.persistence.EntityManager; +import java.util.Collection; + +public class FixturesService implements MagalieService { + + private static final Log log = LogFactory.getLog(FixturesService.class); + + protected MagalieServiceContext serviceContext; + + protected static MagalieFixtures fixtures; + + @Override + public void setServiceContext(MagalieServiceContext serviceContext) { + this.serviceContext = serviceContext; + } + + public void loadFixtures() { + + boolean devMode = serviceContext.getMagalieApplicationConfig().isDevMode(); + + if (devMode) { + + if (fixtures == null) { + + fixtures = new MagalieFixtures("fixtures"); + + } + + if (log.isInfoEnabled()) { + log.info("will restore database with fixture set"); + } + + EntityManager entityManager = + ((DefaultMagalieServiceContext) serviceContext).getEntityManager(); + +// entityManager. +// MetadataImplementor getDatabase +// ull; +// try { +// conn = getConnection(); +// metadata = new DatabaseMetadata(conn, dialect); +// DROP_SCRIPTS = config.generateDropSchemaScript(dialect); +// CREATE_SCRIPTS = config.generateSchemaCreationScript(dialect); +// } finally { +// close(conn); +// } + +// ((org.hibernate.service.internal.SessionFactoryServiceRegistryImpl) ((org.hibernate.ejb.EntityManagerFactoryImpl) entityManager.getEntityManagerFactory()).getSessionFactory().getServiceRegistry()) +// +// ((SessionImpl) entityManager.getDelegate()).get + + MagalieUserDao magalieUserDao = serviceContext.getMagalieUserDao(); + + Collection<MagalieUser> users = fixtures.fixture("users"); + + boolean alreadyLoaded = magalieUserDao.findById(Iterables.get(users, 0).getId()) != null; + + if ( ! alreadyLoaded) { + + for (MagalieUser user : users) { + + magalieUserDao.persist(user); + + } + + SiteDao siteDao = serviceContext.getSiteDao(); + + Collection<Site> sites = fixtures.fixture("sites"); + + for (Site site : sites) { + + siteDao.persist(site); + + } + + ArticleDao articleDao = serviceContext.getArticleDao(); + + Collection<Article> articles = fixtures.fixture("articles"); + + for (Article article : articles) { + + articleDao.persist(article); + + } + + StoredArticleDao storedArticleDao = serviceContext.getStoredArticleDao(); + + Collection<StoredArticle> storedArticles = fixtures.fixture("storedArticles"); + + for (StoredArticle storedArticle : storedArticles) { + + storedArticleDao.persist(storedArticle); + + } + } + + } else { + + if (log.isWarnEnabled()) { + log.warn("tried to load fixtures with devMode disabled, did nothing"); + } + + } + + } + + public <E> E fixture(String id) { + return fixtures.fixture(id); + } +} Copied: trunk/magalie-services/src/main/resources/fixtures.yaml (from rev 45, trunk/magalie-services/src/test/resources/fixtures.yaml) =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml (rev 0) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-03-29 17:12:01 UTC (rev 63) @@ -0,0 +1,146 @@ +alexandre: + &alexandre !user + id: magalie_user_alexandre + login: ale + name: Alexandre + accreditationLevel: 9 + +basile: + &basile !user + id: magalie_user_basile + login: bas + name: Basile + accreditationLevel: 0 + +cathy: + &cathy !user + id: magalie_user_cathy + login: cat + name: Cathy + accreditationLevel: 9 + +david: + &david !user + id: magalie_user_david + login: dav + name: David + accreditationLevel: 0 + +users: + - *alexandre + - *basile + - *cathy + - *david + +site1: + &site1 !site + id: site1 + storeCode: UO1 + locationCode: A1 + requiredAccreditationLevel: 0 + +site2: + &site2 !site + id: site2 + storeCode: UO1 + locationCode: B2 + requiredAccreditationLevel: 9 + +site3: + &site3 !site + id: site3 + storeCode: UO1 + locationCode: C3 + requiredAccreditationLevel: 0 + +site4: + &site4 !site + id: site4 + storeCode: UO1 + locationCode: D4 + requiredAccreditationLevel: 9 + +site5: + &site5 !site + id: site5 + storeCode: UO2 + locationCode: A1 + requiredAccreditationLevel: 0 + +sites: + - *site1 + - *site2 + - *site3 + - *site4 + - *site5 + +article1: + &article1 !article + id: article1 + fixedSites: + - *site1 + code: 111111111 + quantityInKanban: 10 + unit: kg + description: very big screws + +article2: + &article2 !article + id: article2 + code: 222222222 + quantityInKanban: 2 + unit: box + description: little buttons + +article3: + &article3 !article + id: article3 + fixedSites: + - *site2 + code: 333333333 + quantityInKanban: 50 + unit: g + description: magic powder + +articles: + - *article1 + - *article2 + - *article3 + +storedArticle1: + &storedArticle1 !stored-article + id: storedArticle1 + article: *article1 + site: *site1 + quantity: 50 + +storedArticle2: + &storedArticle2 !stored-article + id: storedArticle2 + article: *article1 + site: *site2 + quantity: 20 + +storedArticle3: + &storedArticle3 !stored-article + id: storedArticle3 + article: *article2 + site: *site1 + quantity: 10 + +storedArticle4: + &storedArticle4 !stored-article + id: storedArticle4 + article: *article3 + site: *site4 + quantity: 1000 + +storedArticles: + - *storedArticle1 + - *storedArticle2 + - *storedArticle3 + - *storedArticle4 + +storedArticlesForArticle1: + - *storedArticle1 + - *storedArticle2 Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java 2013-03-29 14:21:44 UTC (rev 62) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java 2013-03-29 17:12:01 UTC (rev 63) @@ -1,14 +1,10 @@ package com.franciaflex.magalie.services; import com.franciaflex.magalie.MagalieApplicationConfig; -import com.franciaflex.magalie.persistence.entity.AbstractEntity; -import com.google.common.collect.Lists; +import com.franciaflex.magalie.services.service.FixturesService; import org.junit.Rule; import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import java.util.Collection; -import java.util.List; import java.util.Map; public abstract class AbstractMagalieServiceTest { @@ -23,6 +19,8 @@ protected FakeMagalieServiceContext serviceContext; + protected FixturesService fixturesService; + protected static MagalieApplicationConfig getMagalieApplicationConfig() { if (magalieApplicationConfig == null) { @@ -35,23 +33,6 @@ } - public static MagalieFixtures getFixtures() { - - if (fixtures == null) { - - fixtures = new MagalieFixtures("fixtures"); - - } - - return fixtures; - } - - protected static <E> E fixture(String id) { - - return getFixtures().fixture(id); - - } - protected MagalieServiceContext getServiceContext() { if (serviceContext == null) { @@ -64,32 +45,25 @@ serviceContext.setEntityManager(entityManager); - MagalieFixtures fixtures = getFixtures(); + this.serviceContext = serviceContext; - List<AbstractEntity> toPersist = Lists.newArrayList(); + } - toPersist.addAll(fixtures.<Collection<? extends AbstractEntity>>fixture("users")); - toPersist.addAll(fixtures.<Collection<? extends AbstractEntity>>fixture("sites")); - toPersist.addAll(fixtures.<Collection<? extends AbstractEntity>>fixture("articles")); - toPersist.addAll(fixtures.<Collection<? extends AbstractEntity>>fixture("storedArticles")); + return serviceContext; - EntityTransaction transaction = entityManager.getTransaction(); + } - transaction.begin(); + protected <E> E fixture(String id) { - for (AbstractEntity entity : toPersist) { + if (fixturesService == null) { - entityManager.persist(entity); + fixturesService = getServiceContext().newService(FixturesService.class); - } + fixturesService.loadFixtures(); - transaction.commit(); - - this.serviceContext = serviceContext; - } - return serviceContext; + return fixturesService.fixture(id); } Deleted: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/MagalieFixtures.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-03-29 14:21:44 UTC (rev 62) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-03-29 17:12:01 UTC (rev 63) @@ -1,47 +0,0 @@ -package com.franciaflex.magalie.services; - -import com.esotericsoftware.yamlbeans.YamlException; -import com.esotericsoftware.yamlbeans.YamlReader; -import com.franciaflex.magalie.MagalieTechnicalException; -import com.franciaflex.magalie.persistence.entity.Article; -import com.franciaflex.magalie.persistence.entity.MagalieUser; -import com.franciaflex.magalie.persistence.entity.RequestedArticle; -import com.franciaflex.magalie.persistence.entity.Site; -import com.franciaflex.magalie.persistence.entity.StoredArticle; -import org.apache.commons.io.Charsets; -import org.apache.commons.io.IOUtils; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Map; - -public class MagalieFixtures { - - protected Map<String, Object> fixtures; - - public MagalieFixtures(String fixturesName) { - String yamlPath = "/" + fixturesName + ".yaml"; - InputStream inputStream = MagalieFixtures.class.getResourceAsStream(yamlPath); - String yaml; - try { - yaml = IOUtils.toString(inputStream, Charsets.UTF_8); - } catch (IOException e) { - throw new IllegalArgumentException(fixturesName + " is not a valid fixtures set name", e); - } - YamlReader reader = new YamlReader(yaml); - reader.getConfig().setClassTag("article", Article.class); - reader.getConfig().setClassTag("stored-article", StoredArticle.class); - reader.getConfig().setClassTag("user", MagalieUser.class); - reader.getConfig().setClassTag("requested-article", RequestedArticle.class); - reader.getConfig().setClassTag("site", Site.class); - try { - fixtures = (Map<String, Object>) reader.read(); - } catch (YamlException e) { - throw new MagalieTechnicalException("unable to read yaml file", e); - } - } - - public <E> E fixture(String id) { - return (E) fixtures.get(id); - } -} Deleted: trunk/magalie-services/src/test/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/test/resources/fixtures.yaml 2013-03-29 14:21:44 UTC (rev 62) +++ trunk/magalie-services/src/test/resources/fixtures.yaml 2013-03-29 17:12:01 UTC (rev 63) @@ -1,146 +0,0 @@ -alexandre: - &alexandre !user - id: magalie_user_alexandre - login: ale - name: Alexandre - accreditationLevel: 9 - -basile: - &basile !user - id: magalie_user_basile - login: bas - name: Basile - accreditationLevel: 0 - -cathy: - &cathy !user - id: magalie_user_cathy - login: cat - name: Cathy - accreditationLevel: 9 - -david: - &david !user - id: magalie_user_david - login: dav - name: David - accreditationLevel: 0 - -users: - - *alexandre - - *basile - - *cathy - - *david - -site1: - &site1 !site - id: site1 - storeCode: UO1 - locationCode: A1 - requiredAccreditationLevel: 0 - -site2: - &site2 !site - id: site2 - storeCode: UO1 - locationCode: B2 - requiredAccreditationLevel: 9 - -site3: - &site3 !site - id: site3 - storeCode: UO1 - locationCode: C3 - requiredAccreditationLevel: 0 - -site4: - &site4 !site - id: site4 - storeCode: UO1 - locationCode: D4 - requiredAccreditationLevel: 9 - -site5: - &site5 !site - id: site5 - storeCode: UO2 - locationCode: A1 - requiredAccreditationLevel: 0 - -sites: - - *site1 - - *site2 - - *site3 - - *site4 - - *site5 - -article1: - &article1 !article - id: article1 - fixedSites: - - *site1 - code: 111111111 - quantityInKanban: 10 - unit: kg - description: very big screws - -article2: - &article2 !article - id: article2 - code: 222222222 - quantityInKanban: 2 - unit: box - description: little buttons - -article3: - &article3 !article - id: article3 - fixedSites: - - *site2 - code: 333333333 - quantityInKanban: 50 - unit: g - description: magic powder - -articles: - - *article1 - - *article2 - - *article3 - -storedArticle1: - &storedArticle1 !stored-article - id: storedArticle1 - article: *article1 - site: *site1 - quantity: 50 - -storedArticle2: - &storedArticle2 !stored-article - id: storedArticle2 - article: *article1 - site: *site2 - quantity: 20 - -storedArticle3: - &storedArticle3 !stored-article - id: storedArticle3 - article: *article2 - site: *site1 - quantity: 10 - -storedArticle4: - &storedArticle4 !stored-article - id: storedArticle4 - article: *article3 - site: *site4 - quantity: 1000 - -storedArticles: - - *storedArticle1 - - *storedArticle2 - - *storedArticle3 - - *storedArticle4 - -storedArticlesForArticle1: - - *storedArticle1 - - *storedArticle2 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-03-29 14:21:44 UTC (rev 62) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-03-29 17:12:01 UTC (rev 63) @@ -27,6 +27,7 @@ import com.franciaflex.magalie.services.DefaultMagalieServiceContext; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; +import com.franciaflex.magalie.services.service.FixturesService; import com.google.common.base.Preconditions; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.Interceptor; @@ -48,6 +49,8 @@ private static final Log log = LogFactory.getLog(MagalieInterceptor.class); + protected boolean fixturesLoaded = false; + @Override public void init() { // nothing to do @@ -67,6 +70,16 @@ MagalieServiceContext serviceContext = newServiceContext(invocation); + if ( ! fixturesLoaded && serviceContext.getMagalieApplicationConfig().isDevMode()) { + + FixturesService fixturesService = serviceContext.newService(FixturesService.class); + + fixturesService.loadFixtures(); + + fixturesLoaded = true; + + } + for (PropertyDescriptor propertyDescriptor : descriptors) { Class<?> propertyType = propertyDescriptor.getPropertyType(); @@ -161,6 +174,12 @@ serviceContext.setEntityManager(entityManager); + MagalieApplicationContext magalieApplicationContext = getMagalieApplicationContext(invocation); + + MagalieApplicationConfig magalieApplicationConfig = magalieApplicationContext.getMagalieApplicationConfig(); + + serviceContext.setMagalieApplicationConfig(magalieApplicationConfig); + return serviceContext; } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-29 14:21:44 UTC (rev 62) +++ trunk/pom.xml 2013-03-29 17:12:01 UTC (rev 63) @@ -266,7 +266,6 @@ <groupId>com.esotericsoftware.yamlbeans</groupId> <artifactId>yamlbeans</artifactId> <version>1.06</version> - <scope>test</scope> </dependency> </dependencies>

1 0

r62 - trunk/magalie-web/src/main/webapp/css
by bleny＠users.forge.codelutin.com 29 Mar '13

29 Mar '13

Author: bleny Date: 2013-03-29 15:21:44 +0100 (Fri, 29 Mar 2013) New Revision: 62 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: tune css for ck3x Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-29 14:06:19 UTC (rev 61) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-29 14:21:44 UTC (rev 62) @@ -27,9 +27,12 @@ #container { position: absolute; - width: 240px; + left: 5px; + top: 5px; + width: 230px; height: 320px; overflow: auto; + background-color: white; } .dl-horizontal dt,

1 0

r61 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie magalie-web/src/main/java/com/franciaflex/magalie/web
by bleny＠users.forge.codelutin.com 29 Mar '13

29 Mar '13

Author: bleny Date: 2013-03-29 15:06:19 +0100 (Fri, 29 Mar 2013) New Revision: 61 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add logs when starting stopping magalie Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.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-03-29 13:20:17 UTC (rev 60) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-03-29 14:06:19 UTC (rev 61) @@ -1,11 +1,13 @@ package com.franciaflex.magalie; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.config.ApplicationConfig; import org.nuiton.util.config.ArgumentsParserException; +import java.util.List; import java.util.Map; import java.util.Properties; @@ -24,8 +26,15 @@ } catch (ArgumentsParserException e) { throw new MagalieTechnicalException(e); } - if (log.isDebugEnabled()) { - log.debug("parsed options in config file" + applicationConfig.getOptions()); + if (log.isInfoEnabled()) { + StringBuilder builder = new StringBuilder(); + List<MagalieConfigOption> options = Lists.newArrayList(MagalieConfigOption.values()); + for (MagalieConfigOption option : options) { + builder.append(String.format("\n%1$-40s = %2$s", + option.getKey(), + applicationConfig.getOption(option))); + } + log.info("MagaLiE configuration:\n" + builder.toString()); } } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.java 2013-03-29 13:20:17 UTC (rev 60) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.java 2013-03-29 14:06:19 UTC (rev 61) @@ -1,11 +1,14 @@ package com.franciaflex.magalie.web; import com.franciaflex.magalie.MagalieApplicationConfig; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.web.filter.JpaTransactionFilter; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; +import javax.persistence.PersistenceException; import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; @@ -13,6 +16,8 @@ public class MagalieJpaTransactionFilter extends JpaTransactionFilter { + private static final Log log = LogFactory.getLog(MagalieJpaTransactionFilter.class); + protected EntityManagerFactory entityManagerFactory; @Override @@ -20,19 +25,52 @@ super.init(filterConfig); + if (log.isInfoEnabled()) { + log.info("start MagaLiE application"); + } + MagalieApplicationConfig applicationConfig = new MagalieApplicationConfig(); Map<String, String> jpaParameters = applicationConfig.getJpaParameters(); - entityManagerFactory = Persistence.createEntityManagerFactory("magaliePersistenceUnit", jpaParameters); + if (log.isInfoEnabled()) { + log.info("creating entity manager factory"); + } + try { + + entityManagerFactory = Persistence.createEntityManagerFactory("magaliePersistenceUnit", jpaParameters); + + } catch (PersistenceException e) { + + if (log.isErrorEnabled()) { + log.error("unable to create entity manager factory", e); + } + + throw e; + + } } @Override protected EntityManager createEntityManager(ServletRequest request) { - EntityManager entityManager = entityManagerFactory.createEntityManager(); + EntityManager entityManager; + try { + + entityManager = entityManagerFactory.createEntityManager(); + + } catch (PersistenceException e) { + + if (log.isErrorEnabled()) { + log.error("unable to create entity manager", e); + } + + throw e; + + } + return entityManager; } @@ -40,7 +78,14 @@ @Override public void destroy() { + if (log.isInfoEnabled()) { + log.info("stopping magalie, will close entity manager factory"); + } + entityManagerFactory.close(); + if (log.isInfoEnabled()) { + log.info("stopping MagaLiE"); + } } }

1 0

r60 - trunk/magalie-web/src/main/webapp/css
by bleny＠users.forge.codelutin.com 29 Mar '13

29 Mar '13

Author: bleny Date: 2013-03-29 14:20:17 +0100 (Fri, 29 Mar 2013) New Revision: 60 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: css for ck3X Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-29 12:17:46 UTC (rev 59) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-29 13:20:17 UTC (rev 60) @@ -51,7 +51,8 @@ } } -@media screen (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { +/* +@media screen and (min-width: 300px) and (min-height: 400px) and (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { body { background-color: grey; @@ -65,3 +66,4 @@ } } +*/ \ No newline at end of file

1 0

r59 - trunk/magalie-web/src/main/webapp/css
by bleny＠users.forge.codelutin.com 29 Mar '13

29 Mar '13

Author: bleny Date: 2013-03-29 13:17:46 +0100 (Fri, 29 Mar 2013) New Revision: 59 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: switch to hibernate update mode for demo Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-29 12:07:18 UTC (rev 58) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-29 12:17:46 UTC (rev 59) @@ -51,7 +51,7 @@ } } -@media screen and (min-width: 300px) and (min-height: 400px) and (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { +@media screen (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { body { background-color: grey;

1 0

r58 - trunk/magalie-persistence/src/main/resources
by bleny＠users.forge.codelutin.com 29 Mar '13

29 Mar '13

Author: bleny Date: 2013-03-29 13:07:18 +0100 (Fri, 29 Mar 2013) New Revision: 58 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: switch to hibernate update mode for demo Modified: trunk/magalie-persistence/src/main/resources/magalie.properties Modified: trunk/magalie-persistence/src/main/resources/magalie.properties =================================================================== --- trunk/magalie-persistence/src/main/resources/magalie.properties 2013-03-29 11:17:12 UTC (rev 57) +++ trunk/magalie-persistence/src/main/resources/magalie.properties 2013-03-29 12:07:18 UTC (rev 58) @@ -1,9 +1,9 @@ javax.persistence.jdbc.driver=org.h2.Driver -javax.persistence.jdbc.url=jdbc:h2:file:/tmp/magalie/h2data;DB_CLOSE_ON_EXIT=FALSE +javax.persistence.jdbc.url=jdbc:h2:file:/tmp/magalie/h2data javax.persistence.jdbc.user=sa javax.persistence.jdbc.password= hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.hbm2ddl.auto=validate +hibernate.hbm2ddl.auto=update hibernate.show_sql=true hibernate.format_sql=true hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy

1 0