branch feature/topia-3.0-beta-17 created (now b153b5e)
This is an automated email from the git hooks/post-receive script. New change to branch feature/topia-3.0-beta-17 in repository sammoa. See http://git.codelutin.com/sammoa.git at b153b5e Upgrade to topia 3.0-beta-17 ; I'm not sure beta-17 is stable enough, this is why I don't merge on develop This branch includes the following new commits: new b153b5e Upgrade to topia 3.0-beta-17 ; I'm not sure beta-17 is stable enough, this is why I don't merge on develop The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b153b5e1506576d9ded484410b89083ff3b5f3c1 Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Jun 5 23:01:55 2015 +0200 Upgrade to topia 3.0-beta-17 ; I'm not sure beta-17 is stable enough, this is why I don't merge on develop -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/topia-3.0-beta-17 in repository sammoa. See http://git.codelutin.com/sammoa.git commit b153b5e1506576d9ded484410b89083ff3b5f3c1 Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Jun 5 23:01:55 2015 +0200 Upgrade to topia 3.0-beta-17 ; I'm not sure beta-17 is stable enough, this is why I don't merge on develop --- pom.xml | 2 +- .../fr/ulr/sammoa/application/SammoaDatabase.java | 29 +++------------------- .../src/test/resources/sammoa-test.properties | 2 +- .../ulr/sammoa/persistence/SammoaPersistence.java | 10 ++++---- .../fr/ulr/sammoa/persistence/SammoaDatabase.java | 27 +++----------------- .../src/test/resources/sammoa-test.properties | 2 +- ...moa-test.properties => sammoa-test.properties~} | 2 +- 7 files changed, 17 insertions(+), 57 deletions(-) diff --git a/pom.xml b/pom.xml index c3efe57..1c6ed34 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ <nuitonI18nVersion>3.3</nuitonI18nVersion> <eugeneVersion>2.13</eugeneVersion> - <topiaVersion>3.0-beta-15</topiaVersion> + <topiaVersion>3.0-beta-17</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> <h2Version>1.3.176</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> diff --git a/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java b/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java index ca7c857..68c12bd 100644 --- a/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java +++ b/sammoa-application/src/test/java/fr/ulr/sammoa/application/SammoaDatabase.java @@ -27,15 +27,15 @@ import fr.ulr.sammoa.persistence.CampaignTopiaDao; import fr.ulr.sammoa.persistence.PersistenceException; import fr.ulr.sammoa.persistence.Region; import fr.ulr.sammoa.persistence.RegionTopiaDao; -import fr.ulr.sammoa.persistence.SammoaEntityEnum; import fr.ulr.sammoa.persistence.SammoaPersistence; import fr.ulr.sammoa.persistence.SammoaTopiaApplicationContext; import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import org.apache.commons.lang3.StringUtils; import org.junit.rules.TestWatcher; import org.junit.runner.Description; +import org.nuiton.topia.persistence.BeanTopiaConfiguration; +import org.nuiton.topia.persistence.TopiaConfigurationBuilder; import org.nuiton.topia.persistence.TopiaConfigurationConstants; -import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,16 +81,6 @@ public class SammoaDatabase extends TestWatcher { this.autoCommitDelay = autoCommitDelay; } - /** - * Obtain all types persisted in this db. - * - * @return all persisted types in this db. - * @since 3.0 - */ - protected Class<? extends TopiaEntity>[] getImplementationClasses() { - return SammoaEntityEnum.getImplementationClasses(); - } - @Override protected void starting(Description description) { @@ -126,7 +116,8 @@ public class SammoaDatabase extends TestWatcher { onDbConfigurationCreate(dbConfiguration, testBasedir, dbPath); - rootCtxt = new SammoaTopiaApplicationContext(dbConfiguration); + BeanTopiaConfiguration topiaConfiguration = new TopiaConfigurationBuilder().readProperties(dbConfiguration); + rootCtxt = new SammoaTopiaApplicationContext(topiaConfiguration); onRootCtxtCreate(rootCtxt); @@ -220,21 +211,9 @@ public class SammoaDatabase extends TestWatcher { } finally { stream.close(); } - result.setProperty( - TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, - getImplementationClassesAsString()); - return result; } - protected final String getImplementationClassesAsString() { - StringBuilder buffer = new StringBuilder(); - for (Class<? extends TopiaEntity> aClass : getImplementationClasses()) { - buffer.append(',').append(aClass.getName()); - } - return buffer.substring(1); - } - public static File getTestSpecificDirectory(Class<?> testClassName, String methodName) { return getTestSpecificDirectory(testClassName, methodName, ""); diff --git a/sammoa-application/src/test/resources/sammoa-test.properties b/sammoa-application/src/test/resources/sammoa-test.properties index 2e16049..9ec0ef5 100644 --- a/sammoa-application/src/test/resources/sammoa-test.properties +++ b/sammoa-application/src/test/resources/sammoa-test.properties @@ -20,7 +20,7 @@ # #L% ### # Proprietes par defaut pour une base de donnees de type H2 et le model legacy -hibernate.hbm2ddl.auto=update +#hibernate.hbm2ddl.auto=update hibernate.show_sql=false hibernate.dialect=org.hibernate.dialect.H2Dialect diff --git a/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java b/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java index cb42a6f..704d086 100644 --- a/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java +++ b/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java @@ -22,7 +22,9 @@ package fr.ulr.sammoa.persistence; import com.google.common.base.Preconditions; -import org.nuiton.topia.persistence.TopiaConfigurationConstants; + +import org.nuiton.topia.persistence.BeanTopiaConfiguration; +import org.nuiton.topia.persistence.TopiaConfigurationBuilder; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; @@ -72,9 +74,7 @@ public class SammoaPersistence implements Closeable { this.dbConfiguration = dbConfiguration; - dbConfiguration.setProperty( - TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, - SammoaEntityEnum.getImplementationClassesAsString()); + BeanTopiaConfiguration topiaConfiguration = new TopiaConfigurationBuilder().readProperties(dbConfiguration); autoSaveListener = new AutoSaveListener(this, autoCommitDelay); @@ -82,7 +82,7 @@ public class SammoaPersistence implements Closeable { // the connection SammoaTopiaPersistenceContext tx = null; try { - rootContext = new SammoaTopiaApplicationContext(dbConfiguration); + rootContext = new SammoaTopiaApplicationContext(topiaConfiguration); tx = rootContext.newPersistenceContext(); } catch (TopiaException ex) { diff --git a/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java b/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java index 4034e55..f62ae81 100644 --- a/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java +++ b/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/SammoaDatabase.java @@ -25,9 +25,10 @@ import com.google.common.base.Throwables; import org.apache.commons.lang3.StringUtils; import org.junit.rules.TestWatcher; import org.junit.runner.Description; +import org.nuiton.topia.persistence.BeanTopiaConfiguration; +import org.nuiton.topia.persistence.TopiaConfigurationBuilder; import org.nuiton.topia.persistence.TopiaConfigurationConstants; import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.TopiaEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,16 +73,6 @@ public class SammoaDatabase extends TestWatcher { this.autoCommitDelay = autoCommitDelay; } - /** - * Obtain all types persisted in this db. - * - * @return all persisted types in this db. - * @since 3.0 - */ - protected Class<? extends TopiaEntity>[] getImplementationClasses() { - return SammoaEntityEnum.getImplementationClasses(); - } - @Override protected void starting(Description description) { @@ -117,7 +108,8 @@ public class SammoaDatabase extends TestWatcher { onDbConfigurationCreate(dbConfiguration, testBasedir, dbPath); - rootCtxt = new SammoaTopiaApplicationContext(dbConfiguration); + BeanTopiaConfiguration topiaConfiguration = new TopiaConfigurationBuilder().readProperties(dbConfiguration); + rootCtxt = new SammoaTopiaApplicationContext(topiaConfiguration); onRootCtxtCreate(rootCtxt); @@ -211,21 +203,10 @@ public class SammoaDatabase extends TestWatcher { } finally { stream.close(); } - result.setProperty( - TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, - getImplementationClassesAsString()); return result; } - protected final String getImplementationClassesAsString() { - StringBuilder buffer = new StringBuilder(); - for (Class<? extends TopiaEntity> aClass : getImplementationClasses()) { - buffer.append(',').append(aClass.getName()); - } - return buffer.substring(1); - } - public static File getTestSpecificDirectory(Class<?> testClassName, String methodName) { return getTestSpecificDirectory(testClassName, methodName, ""); diff --git a/sammoa-persistence/src/test/resources/sammoa-test.properties b/sammoa-persistence/src/test/resources/sammoa-test.properties index 09767b8..0237f99 100644 --- a/sammoa-persistence/src/test/resources/sammoa-test.properties +++ b/sammoa-persistence/src/test/resources/sammoa-test.properties @@ -20,7 +20,7 @@ # #L% ### # Proprietes par defaut pour une base de donnees de type H2 et le model legacy -hibernate.hbm2ddl.auto=update +#hibernate.hbm2ddl.auto=update hibernate.show_sql=false hibernate.dialect=org.hibernate.dialect.H2Dialect diff --git a/sammoa-persistence/src/test/resources/sammoa-test.properties b/sammoa-persistence/src/test/resources/sammoa-test.properties~ similarity index 97% copy from sammoa-persistence/src/test/resources/sammoa-test.properties copy to sammoa-persistence/src/test/resources/sammoa-test.properties~ index 09767b8..9ee7900 100644 --- a/sammoa-persistence/src/test/resources/sammoa-test.properties +++ b/sammoa-persistence/src/test/resources/sammoa-test.properties~ @@ -20,7 +20,7 @@ # #L% ### # Proprietes par defaut pour une base de donnees de type H2 et le model legacy -hibernate.hbm2ddl.auto=update +#hibernate.hbm2ddl.auto=validate hibernate.show_sql=false hibernate.dialect=org.hibernate.dialect.H2Dialect -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm