Author: echatellier Date: 2017-09-12 17:04:49 +0200 (Tue, 12 Sep 2017) New Revision: 4424 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4424 Log: Remove hikari Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-09-12 14:39:41 UTC (rev 4423) +++ trunk/pom.xml 2017-09-12 15:04:49 UTC (rev 4424) @@ -68,13 +68,6 @@ <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate-hikaricp</artifactId> - <version>${hibernateVersion}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> <version>${hibernateVersion}</version> <scope>runtime</scope> Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2017-09-12 14:39:41 UTC (rev 4423) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2017-09-12 15:04:49 UTC (rev 4424) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Tony Chemit + * Copyright (C) 2002 - 2017 Ifremer, Code Lutin, 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 @@ -32,7 +32,6 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; -import org.hibernate.hikaricp.internal.HikariCPConnectionProvider; import org.nuiton.topia.migration.TopiaMigrationEngine; import org.nuiton.topia.migration.TopiaMigrationService; @@ -130,8 +129,7 @@ config.setProperty(Environment.DIALECT, H2Dialect.class.getName()); config.setProperty(Environment.DRIVER, org.h2.Driver.class.getName()); // correct error : org.hibernate.HibernateException: No CurrentSessionContext configured! - //config.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread"); - config.setProperty(Environment.CONNECTION_PROVIDER, HikariCPConnectionProvider.class.getName()); + config.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread"); //config.setProperty(Environment.SHOW_SQL, "true"); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java 2017-09-12 14:39:41 UTC (rev 4423) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java 2017-09-12 15:04:49 UTC (rev 4424) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2014 - 2017 Ifremer, Code Lutin, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -207,9 +207,9 @@ } } // close context for plan generator - // FIXME echatellier 20120904 could throw - //org.nuiton.topia.TopiaException: Ce contexte a deja ete ferme sim.closeStorage(); + sim.closeMemStorage(); + // quoi qu'il arrive on supprime le repertoire temporaire if (!FileUtils.deleteQuietly(tmpDirectory)) { log.warn(t("isisfish.error.remove.directory", tmpDirectory));