This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit ee023b2817b4022a5faa36761f18ea12cce5cb80 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 10 15:54:33 2016 +0100 [persistence] Toujours utiliser la configuration hibernate customisé même pour les services de topia (Fixes #8868) --- .../java/fr/ird/observe/ObserveTopiaApplicationContext.java | 12 ------------ .../main/java/fr/ird/observe/ObserveTopiaConfiguration.java | 6 ++++++ pom.xml | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java b/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java index a48d0e6..3fb657a 100644 --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java +++ b/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java @@ -31,7 +31,6 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; import org.hibernate.cfg.Configuration; import org.hibernate.tool.hbm2ddl.SchemaExport; -import org.nuiton.topia.persistence.HibernateAvailableSettings; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.internal.support.TopiaMetadataModelSupportImpl; import org.nuiton.topia.persistence.jdbc.JdbcH2Helper; @@ -49,7 +48,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.LinkedHashSet; import java.util.Objects; -import java.util.Properties; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; @@ -92,16 +90,6 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat this.topiaMetadataModelSupport = new TopiaMetadataModelSupportImpl("fr.ird.observe", "Observe"); this.topiaSqlTablesFactory = new TopiaSqlTablesFactory(getMetadataModel(), this); this.observeMigrationConfigurationProvider = ObserveMigrationConfigurationProvider.get(); - - // La valeur par défaut dans ToPIA est 20 et c'est trop peu - //FIXME Il semblerait que l'export d'une marée consome une connection mais ne la rend pas - //FIXME On devrait du coup limiter le nombre de marées à exporter (200-300) - Properties properties = new Properties(); - properties.put(HibernateAvailableSettings.C3P0_MAX_SIZE, 500); - properties.put(HibernateAvailableSettings.C3P0_MAX_STATEMENTS, 500); - properties.put(HibernateAvailableSettings.C3P0_TIMEOUT, 100); - getHibernateProvider().getHibernateConfiguration().addProperties(properties); - } @Override diff --git a/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java b/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java index 543f0dd..7793463 100644 --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java +++ b/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java @@ -23,6 +23,7 @@ package fr.ird.observe; */ import org.nuiton.topia.persistence.BeanTopiaConfiguration; +import org.nuiton.topia.persistence.HibernateAvailableSettings; import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; /** @@ -39,6 +40,11 @@ public class ObserveTopiaConfiguration extends BeanTopiaConfiguration { public ObserveTopiaConfiguration(JdbcConfiguration jdbcConfiguration, boolean h2Configuration) { super(jdbcConfiguration); this.h2Configuration = h2Configuration; + + hibernateExtraConfiguration.put(HibernateAvailableSettings.CONNECTION_PROVIDER, "org.hibernate.c3p0.internal.C3P0ConnectionProvider"); + hibernateExtraConfiguration.put(HibernateAvailableSettings.C3P0_MAX_SIZE, "500"); + hibernateExtraConfiguration.put(HibernateAvailableSettings.C3P0_MAX_STATEMENTS, "500"); + hibernateExtraConfiguration.put(HibernateAvailableSettings.C3P0_TIMEOUT, "100"); } public boolean isH2Configuration() { diff --git a/pom.xml b/pom.xml index 6f30653..5517f98 100644 --- a/pom.xml +++ b/pom.xml @@ -161,7 +161,7 @@ <eugenePluginVersion>3.0-alpha-9</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <topiaVersion>3.1.3.2</topiaVersion> + <topiaVersion>3.2-SNAPSHOT</topiaVersion> <jaxxVersion>2.34</jaxxVersion> <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.