Author: tchemit Date: 2013-11-22 21:28:56 +0100 (Fri, 22 Nov 2013) New Revision: 2888 Url: http://nuiton.org/projects/topia/repository/revisions/2888 Log: fixes #2899: Rename commitTransaction() and rollbackTransaction() to commit() and rollback() Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaJpaSupportTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextImplTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextReplicateTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/generator/TopiaTestCase.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/EntityVisitorExportXmlTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/TopiaDAOTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/test/ano1882/DAOAbstractTransformerTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/EnumTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/deletetest/DeleteEntityTest.java trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaTransaction.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaJpaSupportTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaJpaSupportTest.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaJpaSupportTest.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -83,7 +83,7 @@ personneDAO.create( Personne.PROPERTY_NAME, "Hortense", Personne.PROPERTY_GENDER, Gender.FEMALE); - persistenceContext.commitTransaction(); + persistenceContext.commit(); } @Test Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderTest.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderTest.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -129,11 +129,11 @@ PersonDAO dao = TopiaTestDAOHelper.getPersonDAO(transaction); Person personne = dao.create(Personne.PROPERTY_NAME, "Jack Bauer"); - transaction.commitTransaction(); + transaction.commit(); String idPersonne = personne.getTopiaId(); assertNotNull(idPersonne); - transaction.commitTransaction(); + transaction.commit(); } finally { transaction.closeContext(); } Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextImplTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextImplTest.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextImplTest.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -429,7 +429,7 @@ // // personSource.addPet(petSource); // -// txSource.commitTransaction(); +// txSource.commit(); // // daoSource = TopiaTestDAOHelper.getPersonDAO(txSource); // @@ -446,7 +446,7 @@ // txSource.replicateEntity(txTarget, petSource); // txSource.replicateEntity(txTarget, personSource); // -// txTarget.commitTransaction(); +// txTarget.commit(); // // daoTarget = TopiaTestDAOHelper.getPersonDAO(txTarget); // petDAOTarget = TopiaTestDAOHelper.getPetDAO(txTarget); Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextReplicateTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextReplicateTest.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextReplicateTest.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -112,7 +112,7 @@ personSource.addPet(petSource); - txSource.commitTransaction(); + txSource.commit(); daoSource = TopiaTestDAOHelper.getPersonDAO(txSource); @@ -129,7 +129,7 @@ txSource.replicateEntity(txTarget, petSource); txSource.replicateEntity(txTarget, personSource); - txTarget.commitTransaction(); + txTarget.commit(); daoTarget = TopiaTestDAOHelper.getPersonDAO(txTarget); petDAOTarget = TopiaTestDAOHelper.getPetDAO(txTarget); Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/generator/TopiaTestCase.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/generator/TopiaTestCase.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/generator/TopiaTestCase.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -150,7 +150,7 @@ company.addDepartment(dep4); companyDAO.update(company); - newContext.commitTransaction(); + newContext.commit(); newContext = db.beginTransaction(); @@ -161,7 +161,7 @@ Assert.assertEquals(company.getName(), "Ma société"); Assert.assertEquals(company.getDepartment().size(), 4); - newContext.commitTransaction(); + newContext.commit(); // newContext.closeContext(); // } catch (TopiaException e) { // log.error("Erreur pendant le test testCompositeAssociations", e); Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/EntityVisitorExportXmlTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/EntityVisitorExportXmlTest.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/EntityVisitorExportXmlTest.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -99,7 +99,7 @@ clCompany.addDepartment(depComm); clCompany.addDepartment(depDev); - newContext.commitTransaction(); + newContext.commit(); } finally { newContext.closeContext(); Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -66,15 +66,15 @@ // No exception will be thrown with the two properties dao.createByNaturalId(5, "str"); - persistenceContext.commitTransaction(); + persistenceContext.commit(); // No exception will only the need property dao.createByNotNull(3); - persistenceContext.commitTransaction(); + persistenceContext.commit(); // No exception will only the need property dao.create(NaturalizedEntity.PROPERTY_NATURAL_ID_NOT_NULL, 3); - persistenceContext.commitTransaction(); + persistenceContext.commit(); } @Test @@ -88,7 +88,7 @@ // Exception will be throw try { dao.create(); - persistenceContext.commitTransaction(); + persistenceContext.commit(); // Note : this is possible to create an empty entity if the type // is primitive like 'int' which have a default value of '0' @@ -113,12 +113,12 @@ NaturalizedEntity entity = dao.createByNaturalId(5, "str"); - persistenceContext.commitTransaction(); + persistenceContext.commit(); // Exception will be throw : not allowed to modify a naturalId property try { entity.setNaturalIdNotNull(8); - persistenceContext.commitTransaction(); + persistenceContext.commit(); } catch (TopiaException eee) { Assert.assertEquals("org.hibernate.HibernateException", eee.getCause().getClass().getName()); @@ -136,7 +136,7 @@ NaturalizedEntity entity = dao.createByNaturalId(5, "str"); - persistenceContext.commitTransaction(); + persistenceContext.commit(); NaturalizedEntity result = dao.findByNaturalId(5, "str"); @@ -153,7 +153,7 @@ persistenceContext.getNaturalizedEntityDao(); dao.createByNaturalId(5, "str"); - persistenceContext.commitTransaction(); + persistenceContext.commit(); boolean result = dao.existByNaturalId(5, "str"); Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/TopiaDAOTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/TopiaDAOTest.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/TopiaDAOTest.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -79,7 +79,7 @@ createPerson("toto"); List<Person> allPerson = dao.findAll(); Assert.assertEquals(1, allPerson.size()); - context.commitTransaction(); + context.commit(); // recherce la personne créée dans la même transaction Person person2 = createPerson("titi"); @@ -87,7 +87,7 @@ Assert.assertEquals(2, allPerson.size()); Assert.assertThat(allPerson, CoreMatchers.hasItem(person2)); - context.rollbackTransaction(); + context.rollback(); // meme test apres roolback Person person3 = createPerson("tata"); @@ -95,7 +95,7 @@ Assert.assertEquals(2, allPerson.size()); Assert.assertThat(allPerson, CoreMatchers.hasItem(person3)); - context.commitTransaction(); + context.commit(); } @Test @@ -193,7 +193,7 @@ createPerson("toto" + i); } - context.commitTransaction(); + context.commit(); } protected Person createPerson(String name) throws TopiaException { Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/test/ano1882/DAOAbstractTransformerTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/test/ano1882/DAOAbstractTransformerTest.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/test/ano1882/DAOAbstractTransformerTest.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -50,8 +50,8 @@ FrenchCompany.PROPERTY_SIREN2, null, FrenchCompany.PROPERTY_S_IRET, Arrays.asList(siret), FrenchCompany.PROPERTY_SIRET2, null); - transaction.commitTransaction(); + transaction.commit(); dao.delete(entity); - transaction.commitTransaction(); + transaction.commit(); } } Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/EnumTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/EnumTest.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/EnumTest.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -59,7 +59,7 @@ personne.setOtherGender(Gender.MALE); dao.create(personne); String topiaId = personne.getTopiaId(); - transaction.commitTransaction(); + transaction.commit(); transaction.closeContext(); transaction = db.beginTransaction(); Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/deletetest/DeleteEntityTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/deletetest/DeleteEntityTest.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/deletetest/DeleteEntityTest.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -88,21 +88,21 @@ log.debug("CREATE PERSONNE : Bob Marley"); Personne personne = dao.create(Personne.PROPERTY_NAME, "Bob Marley"); - transaction.commitTransaction(); + transaction.commit(); String idPersonne = personne.getTopiaId(); assertNotNull(idPersonne); log.debug("ENTITY PERSONNE SAVED !"); log.debug("DELETE PERSONNE"); dao.delete(personne); - transaction.commitTransaction(); + transaction.commit(); Personne res = dao.forTopiaIdEquals(idPersonne).findAnyOrNull(); assertNull(res); log.debug("ENTITY PERSONNE DELETED !"); log.debug("CREATE PERSONNE : Ziggy Marley"); Personne personne2 = dao.create(Personne.PROPERTY_NAME, "Ziggy Marley"); - transaction.commitTransaction(); + transaction.commit(); String idPersonne2 = personne2.getTopiaId(); assertNotNull(idPersonne2); log.debug("ENTITY PERSONNE SAVED !"); @@ -112,7 +112,7 @@ log.debug("DELETE PERSONNE with PartyDAO"); dao2.delete(personne2); - transaction.commitTransaction(); + transaction.commit(); Party2 res2 = dao2.forTopiaIdEquals(idPersonne2).findAnyOrNull(); assertNull(res2); log.debug("ENTITY PERSONNE DELETED !"); @@ -138,7 +138,7 @@ log.debug("CREATE PERSONNE : Bob Marley"); Personne personne = dao.create(Personne.PROPERTY_NAME, "Bob Marley"); - transaction.commitTransaction(); + transaction.commit(); String idPersonne = personne.getTopiaId(); assertNotNull(idPersonne); log.debug("ENTITY PERSONNE SAVED !"); @@ -147,20 +147,20 @@ log.debug("CREATE CONTACT : jaja@codelutin.com"); Contact2 contact = contactDAO.create(Contact2.PROPERTY_CONTACT_VALUE, "jaja@codelutin.com"); - transaction.commitTransaction(); + transaction.commit(); String idContact = contact.getTopiaId(); assertNotNull(idContact); log.debug("ENTITY CONTACT SAVED !"); log.debug("ADD CONTACT TO PERSONNE"); personne.addContacts(contact); - transaction.commitTransaction(); + transaction.commit(); assertEquals(1, personne.getContacts().size()); log.debug("CONTACT ADDED !"); log.debug("DELETE PERSONNE"); dao.delete(personne); - transaction.commitTransaction(); + transaction.commit(); Personne res = dao.forTopiaIdEquals(idPersonne).findAnyOrNull(); assertNull(res); log.debug("ENTITY PERSONNE DELETED !"); @@ -169,7 +169,7 @@ log.debug("DELETE CONTACT"); contactDAO.delete(contact); - transaction.commitTransaction(); + transaction.commit(); Contact2 res2 = contactDAO.forTopiaIdEquals(idContact).findAnyOrNull(); assertNull(res2); log.debug("ENTITY PERSONNE DELETED !"); Modified: trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -27,7 +27,6 @@ import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.topia.TopiaException; public class TopiaAbstractTest { @@ -40,7 +39,7 @@ CarDAO carDAO = TopiaTestAbstractDAOHelper.getCarDAO(transaction); carDAO.create(); - transaction.commitTransaction(); + transaction.commit(); } finally { context.closeContext(); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -298,7 +298,7 @@ } @Override - public void commitTransaction() { + public void commit() { checkClosed(); try { @@ -329,7 +329,7 @@ } @Override - public void rollbackTransaction() { + public void rollback() { checkClosed(); try { Session hibernateSession = hibernateSupport.getHibernateSession(); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -80,7 +80,7 @@ * @deprecated use method from {@link TopiaTransaction} */ @Deprecated - void commitTransaction() throws TopiaException; + void commit() throws TopiaException; /** * Cancels all the modifications made to this context, coming back to the @@ -91,7 +91,7 @@ * @deprecated use method from {@link TopiaTransaction} */ @Deprecated - void rollbackTransaction() throws TopiaException; + void rollback() throws TopiaException; /** * Closes the context. All the children contexts will be closed in the same Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaTransaction.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaTransaction.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaTransaction.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -36,13 +36,13 @@ * Applies all the modifications made to this context on the persistence * device. Once commit is done, a new transaction is started. */ - void commitTransaction(); + void commit(); /** * Cancels all the modifications made to this context, coming back to the * state on the last beginTransaction. Once rollback is done, a new * transaction is started. */ - void rollbackTransaction(); + void rollback(); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -818,7 +818,7 @@ } @Override - public void commitTransaction() throws TopiaException { + public void commit() throws TopiaException { if (equals(getRootContext())) { throw new TopiaException(String.format("Unsupported operation %s on root context", "commit")); @@ -829,7 +829,7 @@ try { // for (TopiaDAO<? extends TopiaEntity> dao : daoCache.values()) { // // TODO-fdesbois-20100507 : need to be removed for 2.5 version -// dao.commitTransaction(); +// dao.commit(); // } Transaction tx = hibernate.getTransaction(); // Transaction tx = hibernate.beginTransaction(); @@ -856,7 +856,7 @@ } @Override - public void rollbackTransaction() throws TopiaException { + public void rollback() throws TopiaException { if (equals(getRootContext())) { throw new TopiaException(String.format("Unsupported operation %s on root context", "rollback")); @@ -866,7 +866,7 @@ try { // for (TopiaDAO<? extends TopiaEntity> dao : daoCache.values()) { // // TODO-fdesbois-20100507 : need to be removed for 2.5 version -// dao.rollbackTransaction(); +// dao.rollback(); // } Transaction tx = hibernate.getTransaction(); // Transaction tx = hibernate.beginTransaction(); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -134,7 +134,7 @@ updateSequences(newContext); } } - newContext.commitTransaction(); + newContext.commit(); newContext.closeContext(); } @@ -349,7 +349,7 @@ stmt.execute(sql); } }); - //ctxt.commitTransaction(); + //ctxt.commit(); } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -223,9 +223,9 @@ try { ctxt.restore(databaseDump); - ctxt.commitTransaction(); + ctxt.commit(); } catch (TopiaException e) { - ctxt.rollbackTransaction(); + ctxt.rollback(); throw e; } finally { ctxt.closeContext(); Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -116,13 +116,13 @@ migrateForVersion(v, tx, showSql, showProgression); // commit des modifs - tx.commitTransaction(); + tx.commit(); } catch (Exception eee) { // en cas d'erreur log.error("Could not migrate database", eee); // rollback du travail en cours - tx.rollbackTransaction(); + tx.rollback(); // propagation de l'erreur throw eee; } finally { Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -39,7 +39,6 @@ import org.nuiton.topia.event.TopiaTransactionEvent; import org.nuiton.topia.event.TopiaTransactionVetoable; import org.nuiton.topia.framework.AbstractTopiaContext; -import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaUtil; import org.nuiton.topia.migration.mappings.TMSVersion; import org.nuiton.topia.migration.mappings.TMSVersionDAO; @@ -467,10 +466,10 @@ log.debug("Created version: " + tmsVersion.getVersion()); } - tx.commitTransaction(); + tx.commit(); } catch (TopiaException e) { if (tx != null) { - tx.rollbackTransaction(); + tx.rollback(); } throw e; } finally { Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -104,7 +104,7 @@ try { Session session = tx.getHibernateSession(); session.saveOrUpdate(version); - tx.commitTransaction(); + tx.commit(); } catch (HibernateException e) { throw new TopiaException("Could not update version " + version, e); } Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -203,7 +203,7 @@ try { if (rollback) { - tx.rollbackTransaction(); + tx.rollback(); } } finally { tx.closeContext(); Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -236,7 +236,7 @@ } if (shouldCommit) { - dstCtxt.commitTransaction(); + dstCtxt.commit(); } } } Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -86,7 +86,7 @@ srcCtxt.replicateEntities(dstCtxt, entities); // sauvegarde de la destination - dstCtxt.commitTransaction(); + dstCtxt.commit(); } @@ -123,7 +123,7 @@ allIds.clear(); // commit des suppressions - dstCtxt.commitTransaction(); + dstCtxt.commit(); } } } Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -106,7 +106,7 @@ public void tearDown() throws Exception { if (ctxt != null) { - ctxt.rollbackTransaction(); + ctxt.rollback(); ctxt.closeContext(); ctxt = null; } Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -298,7 +298,7 @@ pet2 = tx.getDao(Pet.class).create(Pet.PROPERTY_NAME, "pudding II"); race2 = tx.getDao(Race.class).create(Race.PROPERTY_NAME, "race II"); - tx.commitTransaction(); + tx.commit(); tx.closeContext(); return context; } Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -248,7 +248,7 @@ race3 = tx.getDao(Race.class).create(Race.PROPERTY_NAME, "race III"); pet3 = tx.getDao(Pet.class).create(Pet.PROPERTY_NAME, "pudding III", Pet.PROPERTY_RACE, race3); - tx.commitTransaction(); + tx.commit(); tx.closeContext(); return context; } Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java 2013-11-22 20:13:35 UTC (rev 2887) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java 2013-11-22 20:28:56 UTC (rev 2888) @@ -273,10 +273,10 @@ srcCtxt.replicateEntity(dstCtxt, pet); - dstCtxt.commitTransaction(); + dstCtxt.commit(); } finally { - srcCtxt.rollbackTransaction(); + srcCtxt.rollback(); srcCtxt.closeContext(); dstCtxt.closeContext(); } @@ -310,20 +310,20 @@ pet.setPerson(null); srcCtxt.replicateEntity(dstCtxt, pet); - srcCtxt.rollbackTransaction(); + srcCtxt.rollback(); srcCtxt.replicateEntity(dstCtxt, person); - dstCtxt.commitTransaction(); + dstCtxt.commit(); ((Pet) dstCtxt.findByTopiaId(pet.getTopiaId())).setPerson((Person) dstCtxt.findByTopiaId(person.getTopiaId())); - dstCtxt.commitTransaction(); + dstCtxt.commit(); - srcCtxt.rollbackTransaction(); + srcCtxt.rollback(); person = update(person); assertEntityEquals(person, dstCtxt.findByTopiaId(person.getTopiaId()), null); } finally { - srcCtxt.rollbackTransaction(); + srcCtxt.rollback(); //srcCtxt.closeContext(); dstCtxt.closeContext(); } @@ -362,13 +362,13 @@ srcCtxt.replicateEntity(dstCtxt, person); srcCtxt.replicateEntity(dstCtxt, pet); - srcCtxt.rollbackTransaction(); - dstCtxt.commitTransaction(); + srcCtxt.rollback(); + dstCtxt.commit(); //((Person) dstCtxt.findByTopiaId(person.getTopiaId())).addPet(((Pet) dstCtxt.findByTopiaId(pet.getTopiaId()))); - //dstCtxt.commitTransaction(); + //dstCtxt.commit(); - srcCtxt.rollbackTransaction(); + srcCtxt.rollback(); srcCtxt.closeContext(); dstCtxt.closeContext(); @@ -407,7 +407,7 @@ race3 = tx.getDao(Race.class).create(Race.PROPERTY_NAME, "race III"); pet3 = tx.getDao(Pet.class).create(Pet.PROPERTY_NAME, "pudding III", Pet.PROPERTY_RACE, race3); - tx.commitTransaction(); + tx.commit(); tx.closeContext(); return context; }