This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 6caccbb0dbc4f4de227f4d527e052c2e6610b20a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 11 10:18:27 2016 +0100 [persistence] Toujours utiliser la configuration hibernate customisé même pour les services de topia (Fixes #8868) --- .../fr/ird/observe/ObserveTopiaApplicationContext.java | 16 ++-------------- .../java/fr/ird/observe/ObserveTopiaConfiguration.java | 10 +++++++--- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java b/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java index 2b038e3..4debf52 100644 --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java +++ b/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java @@ -32,7 +32,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; @@ -51,7 +50,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; @@ -94,16 +92,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 @@ -308,7 +296,7 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat basketTable.getWhereClauseAlias(), ImmutableSet.of(" INNER JOIN observe_longline.set set ON set.topiaId = activity.set", " INNER JOIN observe_longline.basket basket ON basket.set = set.topiaId" - ), + ), null); tripLonglineTables.replaceTable("observe_longline.basket", basketTable); @@ -325,7 +313,7 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat ImmutableSet.of(" INNER JOIN observe_longline.set set ON set.topiaId = activity.set", " INNER JOIN observe_longline.basket basket ON basket.set = set.topiaId", " INNER JOIN observe_longline.branchline branchline ON branchline.basket = basket.topiaId" - ), + ), null); tripLonglineTables.replaceTable("observe_longline.branchline", branchlineTable); diff --git a/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java b/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java index 2eb67ef..939cbd9 100644 --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java +++ b/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java @@ -4,7 +4,7 @@ package fr.ird.observe; * #%L * ObServe :: Entities * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -22,8 +22,8 @@ package fr.ird.observe; * #L% */ -import com.google.common.collect.ImmutableMap; import org.nuiton.topia.persistence.BeanTopiaConfiguration; +import org.nuiton.topia.persistence.HibernateAvailableSettings; import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; /** @@ -43,8 +43,12 @@ public class ObserveTopiaConfiguration extends BeanTopiaConfiguration { this.h2Configuration = h2Configuration; this.showSql = showSql; if (showSql) { - setHibernateExtraConfiguration(ImmutableMap.of("hibernate.show_sql", Boolean.TRUE.toString())); + hibernateExtraConfiguration.put("hibernate.show_sql", Boolean.TRUE.toString()); } + 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() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.