Author: athimel Date: 2014-07-15 10:39:43 +0200 (Tue, 15 Jul 2014) New Revision: 727 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/727 Log: plug trunk to latests versions (mavenpom, nuiton-csv, nuiton-utils) and SNAPSHOT (eugene, topia) Modified: trunk/pom.xml trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java trunk/sammoa-persistence/src/main/xmi/sammoa.properties trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-02 07:22:21 UTC (rev 726) +++ trunk/pom.xml 2014-07-15 08:39:43 UTC (rev 727) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.7</version> + <version>5.0.9</version> </parent> <groupId>fr.ulr</groupId> @@ -87,15 +87,15 @@ <releaseEmailDomain>forge.codelutin.com</releaseEmailDomain> <!-- libraries version --> - <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-rc-4</nuitonUtilsVersion> <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> - <nuitonCvsVersion>3.0-rc-1</nuitonCvsVersion> + <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonI18nVersion>3.1</nuitonI18nVersion> - <eugeneVersion>2.9</eugeneVersion> - <topiaVersion>3.0-beta-4</topiaVersion> + <eugeneVersion>2.12-SNAPSHOT</eugeneVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> <h2Version>1.3.176</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> @@ -183,7 +183,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> - <version>${nuitonCvsVersion}</version> + <version>${nuitonCsvVersion}</version> </dependency> <dependency> Modified: trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java =================================================================== --- trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java 2014-07-02 07:22:21 UTC (rev 726) +++ trunk/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java 2014-07-15 08:39:43 UTC (rev 727) @@ -144,7 +144,7 @@ if (rootCtxt != null && !rootCtxt.isClosed()) { try { - rootCtxt.closeContext(); + rootCtxt.close(); } catch (TopiaException e) { if (log.isErrorEnabled()) { log.error("Could not close topia root context", e); Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java 2014-07-02 07:22:21 UTC (rev 726) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java 2014-07-15 08:39:43 UTC (rev 727) @@ -139,7 +139,7 @@ * * @param transaction SammoaTopiaPersistenceContext to end * @see #beginTransaction() - * @see SammoaTopiaPersistenceContext#closeContext() + * @see SammoaTopiaPersistenceContext#close() */ public void endTransaction(SammoaTopiaPersistenceContext transaction) { closeContext(transaction); @@ -184,7 +184,7 @@ public void close() { autoSaveListener.stop(); if (rootContext != null) { - rootContext.closeContext(); + rootContext.close(); rootContext = null; } } @@ -217,11 +217,11 @@ * Close the given {@link SammoaTopiaPersistenceContext}. Errors are thrown using {@link TopiaException} * * @param context the SammoaTopiaPersistenceContext - * @see SammoaTopiaPersistenceContext#closeContext() + * @see SammoaTopiaPersistenceContext#close() */ protected void closeContext(SammoaTopiaPersistenceContext context) { if (!context.isClosed()) { - context.closeContext(); + context.close(); } } Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java 2014-07-02 07:22:21 UTC (rev 726) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java 2014-07-15 08:39:43 UTC (rev 727) @@ -31,8 +31,9 @@ public class SammoaTopiaPersistenceContext extends AbstractSammoaTopiaPersistenceContext { - public SammoaTopiaPersistenceContext(HibernateProvider hibernateProvider, TopiaListenableSupport listenableSupport, TopiaIdFactory topiaIdFactory, TopiaHibernateSessionRegistry sessionRegistry) { - super(hibernateProvider, listenableSupport, topiaIdFactory, sessionRegistry); + public SammoaTopiaPersistenceContext(HibernateProvider hibernateProvider, TopiaFiresSupport applicationFiresSupport, + TopiaIdFactory topiaIdFactory, TopiaHibernateSessionRegistry sessionRegistry) { + super(hibernateProvider, applicationFiresSupport, topiaIdFactory, sessionRegistry); } public TopiaJpaSupport getJpaSupport() { Modified: trunk/sammoa-persistence/src/main/xmi/sammoa.properties =================================================================== --- trunk/sammoa-persistence/src/main/xmi/sammoa.properties 2014-07-02 07:22:21 UTC (rev 726) +++ trunk/sammoa-persistence/src/main/xmi/sammoa.properties 2014-07-15 08:39:43 UTC (rev 727) @@ -30,6 +30,7 @@ model.tagValue.generateOperatorForDAOHelper=true model.tagValue.generateStandaloneEnumForDAOHelper=true model.tagValue.contextable=true +model.tagValue.generatePropertyChangeSupport=true #model.tagvalue.java.lang.String=text Modified: trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java =================================================================== --- trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java 2014-07-02 07:22:21 UTC (rev 726) +++ trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java 2014-07-15 08:39:43 UTC (rev 727) @@ -135,7 +135,7 @@ if (rootCtxt != null && !rootCtxt.isClosed()) { try { - rootCtxt.closeContext(); + rootCtxt.close(); } catch (TopiaException e) { if (log.isErrorEnabled()) { log.error("Could not close topia root context", e);