Author: bleny Date: 2013-06-27 16:27:22 +0200 (Thu, 27 Jun 2013) New Revision: 260 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: use IdFactory Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java trunk/magalie-persistence/src/main/xmi/magalie.properties trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-06-27 12:29:36 UTC (rev 259) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-06-27 14:27:22 UTC (rev 260) @@ -23,6 +23,8 @@ * #L% */ +import org.nuiton.jpa.api.DefaultJpaEntityIdFactory; +import org.nuiton.jpa.api.JpaEntityIdFactoryResolver; import org.nuiton.jpa.hibernate.HibernateUtil; import javax.persistence.EntityManager; @@ -31,6 +33,7 @@ public JpaMagaliePersistenceContext(EntityManager entityManager) { super(entityManager); + JpaEntityIdFactoryResolver.setFactory(new DefaultJpaEntityIdFactory()); } public void clearDatabase() { Modified: trunk/magalie-persistence/src/main/xmi/magalie.properties =================================================================== --- trunk/magalie-persistence/src/main/xmi/magalie.properties 2013-06-27 12:29:36 UTC (rev 259) +++ trunk/magalie-persistence/src/main/xmi/magalie.properties 2013-06-27 14:27:22 UTC (rev 260) @@ -20,6 +20,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### +model.tagValue.idFactory=true + com.franciaflex.magalie.persistence.entity.Article.attribute.fixedLocations.stereotype=unique com.franciaflex.magalie.persistence.entity.ReceivedPreparedArticleReception.attribute.storageMovements.stereotype=unique 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-06-27 12:29:36 UTC (rev 259) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-06-27 14:27:22 UTC (rev 260) @@ -150,8 +150,6 @@ } - persistenceContext.commit(); - LocationJpaDao locationDao = persistenceContext.getLocationDao(); Collection<Location> locations = fixtures.fixture("locations"); @@ -162,8 +160,6 @@ } - persistenceContext.commit(); - SupplierJpaDao supplierDao = persistenceContext.getSupplierDao(); Collection<Supplier> suppliers = fixtures.fixture("suppliers"); @@ -174,15 +170,13 @@ } - persistenceContext.commit(); - ArticleJpaDao articleDao = persistenceContext.getArticleDao(); Collection<Article> articles = fixtures.fixture("articles"); for (Article article : articles) { - articleDao.merge(article); + articleDao.persist(article); } @@ -196,8 +190,6 @@ } - persistenceContext.commit(); - StoredArticleJpaDao storedArticleDao = persistenceContext.getStoredArticleDao(); Collection<StoredArticle> storedArticles = fixtures.fixture("storedArticles"); @@ -208,8 +200,6 @@ } - persistenceContext.commit(); - RequestedListJpaDao requestedListDao = persistenceContext.getRequestedListDao(); Collection<RequestedList> requestedLists = fixtures.fixture("requestedLists"); @@ -220,8 +210,6 @@ } - persistenceContext.commit(); - RequestedArticleJpaDao requestedArticleDao = persistenceContext.getRequestedArticleDao(); Collection<RequestedArticle> requestedArticles = fixtures.fixture("requestedArticles"); @@ -232,8 +220,6 @@ } - persistenceContext.commit(); - PreparedArticleReceptionJpaDao preparedArticleReceptionDao = persistenceContext.getPreparedArticleReceptionDao(); Collection<PreparedArticleReception> preparedArticleReceptions = fixtures.fixture("preparedArticleReceptions");