branch develop updated (611f8c6 -> a8b986e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 611f8c6 ajout de filtre sur les espèces (refs #7604) new a8b986e suppresion des paramètres specifiques à une base H2 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 a8b986e45d13f06720fdecd74f157f929a632644 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 20 10:41:19 2015 +0200 suppresion des paramètres specifiques à une base H2 Summary of changes: .../fr/ird/observe/ObserveTopiaConfigurationFactory.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit a8b986e45d13f06720fdecd74f157f929a632644 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 20 10:41:19 2015 +0200 suppresion des paramètres specifiques à une base H2 --- .../fr/ird/observe/ObserveTopiaConfigurationFactory.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java index 116d6b7..04bc902 100644 --- a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java @@ -158,13 +158,13 @@ public class ObserveTopiaConfigurationFactory { ); topiaConfiguration.addDeclaredService(ObserveTopiaApplicationContext.MIGRATION_SERVICE_NAME, ObserveMigrationEngine.class, migrationServiceConfiguration); topiaConfiguration.addDeclaredService(ObserveTopiaApplicationContext.REPLICATION_SERVICE_NAME, TopiaReplicationServiceImpl.class); - if (h2Configuration) { - //FIXME J'ai mis ça mais sans conviction car y'a d'autres pb à régler et c3p0 n'est peut-être pas la cause - // On ne veut pas utiliser c3pO dans ce cas - topiaConfiguration.setHibernateExtraConfiguration( - ImmutableMap.of("hibernate.connection.provider_class", "org.nuiton.topia.persistence.internal.TopiaConnectionProvider") - ); - } +// if (h2Configuration) { +// //FIXME J'ai mis ça mais sans conviction car y'a d'autres pb à régler et c3p0 n'est peut-être pas la cause +// // On ne veut pas utiliser c3pO dans ce cas +// topiaConfiguration.setHibernateExtraConfiguration( +// ImmutableMap.of("hibernate.connection.provider_class", "org.nuiton.topia.persistence.internal.TopiaConnectionProvider") +// ); +// } return topiaConfiguration; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm