- Isis-fish-commits - mailman.cloud.codelutin.com

Message Restriction Activity
by list.isis-fish.org 11 Oct '25

11 Oct '25

1 0

You have (3) important emails awaiting delivery to your inbox
by list.isis-fish.org 10 Oct '25

10 Oct '25

1 0

Email Error Alert
by list.isis-fish.org 28 Sep '25

28 Sep '25

1 0

Suspension Notice
by list.isis-fish.org 25 Aug '25

25 Aug '25

1 0

r4427 - trunk/src/main/resources/i18n
by jcouteau＠users.forge.codelutin.com 18 Apr '18

18 Apr '18

Author: jcouteau Date: 2018-04-18 15:38:48 +0200 (Wed, 18 Apr 2018) New Revision: 4427 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4427 Log: Fix typo Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2018-04-18 13:36:36 UTC (rev 4426) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2018-04-18 13:38:48 UTC (rev 4427) @@ -486,7 +486,7 @@ isisfish.input.createNewRegion=Create isisfish.input.map.copytoclicboard=Copy to clipboard isisfish.input.menu.addRegion=Add region -isisfish.input.menu.changeResolution=Changer spatial resolution +isisfish.input.menu.changeResolution=Change spatial resolution isisfish.input.menu.commit=Commit change isisfish.input.menu.copyRegion=Copy region isisfish.input.menu.exportJson=Export current object in JSON

1 0

r4426 - trunk/src/main/resources/i18n
by jcouteau＠users.forge.codelutin.com 18 Apr '18

18 Apr '18

Author: jcouteau Date: 2018-04-18 15:36:36 +0200 (Wed, 18 Apr 2018) New Revision: 4426 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4426 Log: Fix typos Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2017-09-13 21:10:16 UTC (rev 4425) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2018-04-18 13:36:36 UTC (rev 4426) @@ -496,8 +496,8 @@ isisfish.input.menu.importRegion=Import region isisfish.input.menu.importRegionSimulation=Import region from simulation isisfish.input.menu.importRenameRegion=Import region and rename -isisfish.input.menu.removeLocaly=Remove localy -isisfish.input.menu.removeLocalyRemotely=Remove localy and remotely +isisfish.input.menu.removeLocaly=Remove locally +isisfish.input.menu.removeLocalyRemotely=Remove locally and remotely isisfish.input.menu.sensitivity=Mexico isisfish.input.menu.sensitivity.export=Export database factors isisfish.input.menu.server=Server @@ -841,8 +841,8 @@ isisfish.script.menu.checkSyntax=Check syntax isisfish.script.menu.code=Code isisfish.script.menu.commit=Commit script to server -isisfish.script.menu.deleteLocaly=Delete localy -isisfish.script.menu.deleteLocalyServer=Delete localy and on server +isisfish.script.menu.deleteLocaly=Delete locally +isisfish.script.menu.deleteLocalyServer=Delete locally and on server isisfish.script.menu.diff=Display diff with server version isisfish.script.menu.edit=Edit isisfish.script.menu.evaluate=Evaluate

1 0

r4425 - in trunk: . src/test/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com 13 Sep '17

13 Sep '17

Author: echatellier Date: 2017-09-13 23:10:16 +0200 (Wed, 13 Sep 2017) New Revision: 4425 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4425 Log: Add test to show topia connection closing leak Modified: trunk/pom.xml trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-09-12 15:04:49 UTC (rev 4424) +++ trunk/pom.xml 2017-09-13 21:10:16 UTC (rev 4425) @@ -561,7 +561,7 @@  <jaxxVersion>2.41</jaxxVersion> - <topiaVersion>2.12</topiaVersion> + <topiaVersion>2.12.1-SNAPSHOT</topiaVersion> <hibernateVersion>5.1.10.Final</hibernateVersion> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2017-09-12 15:04:49 UTC (rev 4424) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2017-09-13 21:10:16 UTC (rev 4425) @@ -26,6 +26,7 @@ package fr.ifremer.isisfish.simulator.launcher; import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -33,6 +34,7 @@ import java.util.SortedMap; import java.util.TreeMap; +import fr.ifremer.isisfish.datastore.IsisH2Config; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -42,6 +44,7 @@ import org.nuiton.math.matrix.MatrixHelper; import org.nuiton.math.matrix.MatrixND; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.AbstractIsisFishTest; @@ -75,6 +78,8 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.types.Month; +import org.nuiton.topia.framework.TopiaContextImpl; +import org.nuiton.util.FileUtil; /** * Test for {@link SimulationService}. @@ -610,4 +615,42 @@ Assert.assertTrue(preScriptContent.contains("beanUtils.convert(\"String myValue=\\\"test2\\\"")); Assert.assertTrue(preScriptContent.contains("BeanUtils.setProperty(entity0, \"growthEquationContent\"")); } + + /** + * Test que lorsque l'on lance beaucoup de simulations, il ne reste oas des threads inutiles qui occupent toutes + * les ressources de la machines. + * @throws InterruptedException + */ + @Test + @Ignore + public void testNonClosedThreadsWhenRunningALotOfSimulations() throws IOException, InterruptedException { + //RegionStorage region = RegionStorage.getRegion("DemoRegion"); + + File dirTest = FileUtil.createTempDirectory("sims-", "test", new File("target")).getAbsoluteFile(); + + for (int i = 0; i <= 20; i++) { + // V1 + // SimulationStorage sim = SimulationStorage.importAndRenameZip( + // dirTest, initialZip, "sim" + i); + + // v2 + //SimulationStorage result = new SimulationStorage(dirTest, "test" + i, null); + //TopiaContext tx = result.getStorage().beginTransaction(); + //tx.closeContext(); + //result.closeStorage(); + + // v3 + File simDir = new File(dirTest, "sim" + i); + Properties config = new Properties(); + IsisH2Config.addDatabaseConfig(config, simDir); + TopiaContext storage = TopiaContextFactory.getContext(config); + storage.closeContext(); + } + + Thread.getAllStackTraces().keySet().forEach(t -> System.out.println(t.getName())); + + // une seule simulation en prends 10 + // donc meme pour 100 simulations, ca ne devrait pas être beaucoup plus + Assert.assertTrue(String.format("Il y a %d threads", Thread.activeCount()), Thread.activeCount() < 100); + } }

1 0

r4424 - in trunk: . src/main/java/fr/ifremer/isisfish/datastore src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com 12 Sep '17

12 Sep '17

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));

1 0

r4423 - in trunk: . src/main/java/fr/ifremer/isisfish/datastore src/main/javascript/templates/web
by echatellier＠users.forge.codelutin.com 12 Sep '17

12 Sep '17

Author: echatellier Date: 2017-09-12 16:39:41 +0200 (Tue, 12 Sep 2017) New Revision: 4423 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4423 Log: Update libs Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java trunk/src/main/javascript/templates/web/region-web.html Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-09-12 10:33:07 UTC (rev 4422) +++ trunk/pom.xml 2017-09-12 14:39:41 UTC (rev 4423) @@ -20,7 +20,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-18</version> + <version>3.0</version> <scope>compile</scope> </dependency> @@ -27,7 +27,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.2</version> + <version>3.3</version> <scope>compile</scope> </dependency> @@ -65,9 +65,16 @@ <version>${hibernateVersion}</version> <scope>compile</scope> </dependency> - + <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> @@ -135,7 +142,7 @@ <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> - <version>1.5.6</version> + <version>1.6.0</version> <scope>compile</scope> </dependency> @@ -192,7 +199,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.5</version> + <version>3.6</version> </dependency> <dependency> @@ -223,7 +230,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> - <version>1.4</version> + <version>1.5</version> </dependency> <dependency> @@ -312,7 +319,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.4.194</version> + <version>1.4.196</version> <scope>compile</scope> </dependency> @@ -332,7 +339,7 @@ <dependency> <groupId>ca.umontreal.iro.simul</groupId> <artifactId>ssj</artifactId> - <version>3.2.0</version> + <version>3.2.1</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -351,7 +358,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.8.12</version> + <version>1.9.0</version> <scope>compile</scope> <exclusions> <exclusion> @@ -373,7 +380,7 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.25-incubating</version> + <version>2.3.26-incubating</version> <scope>compile</scope> </dependency> @@ -386,25 +393,25 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>20.0</version> + <version>23.0</version> </dependency> <dependency> <groupId>com.opencsv</groupId> <artifactId>opencsv</artifactId> - <version>3.9</version> + <version>4.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.8.7</version> + <version>2.9.1</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.8.7</version> + <version>2.9.1</version> </dependency>  @@ -562,7 +569,7 @@  <jaxxVersion>2.41</jaxxVersion> <topiaVersion>2.12</topiaVersion> - <hibernateVersion>5.1.5.Final</hibernateVersion> + <hibernateVersion>5.1.10.Final</hibernateVersion> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <redmine.releaseFiles>target/isis-fish-${project.version}-bin.zip</redmine.releaseFiles> @@ -612,7 +619,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.4.1</version> + <version>3.0.0-M1</version> <executions> <execution> <id>enforce-bytecode-version</id> @@ -622,7 +629,7 @@ <configuration> <rules> <enforceBytecodeVersion> - <maxJdkVersion>1.7</maxJdkVersion> + <maxJdkVersion>1.8</maxJdkVersion> </enforceBytecodeVersion> </rules> <fail>true</fail> @@ -633,7 +640,7 @@ <dependency> <groupId>org.codehaus.mojo</groupId> <artifactId>extra-enforcer-rules</artifactId> - <version>1.0-beta-4</version> + <version>1.0-beta-6</version> </dependency> </dependencies> </plugin> @@ -764,9 +771,9 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>1.3</version> + <version>1.5</version> <configuration> - <nodeVersion>v7.7.4</nodeVersion> + <nodeVersion>v8.4.0</nodeVersion> </configuration> <executions> <execution> Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2017-09-12 10:33:07 UTC (rev 4422) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2017-09-12 14:39:41 UTC (rev 4423) @@ -32,6 +32,7 @@ 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; @@ -129,7 +130,8 @@ 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.CURRENT_SESSION_CONTEXT_CLASS, "thread"); + config.setProperty(Environment.CONNECTION_PROVIDER, HikariCPConnectionProvider.class.getName()); //config.setProperty(Environment.SHOW_SQL, "true"); Modified: trunk/src/main/javascript/templates/web/region-web.html =================================================================== --- trunk/src/main/javascript/templates/web/region-web.html 2017-09-12 10:33:07 UTC (rev 4422) +++ trunk/src/main/javascript/templates/web/region-web.html 2017-09-12 14:39:41 UTC (rev 4423) @@ -1,3 +1,24 @@ + <!doctype html> <html> <head>

1 0

r4422 - trunk
by echatellier＠users.forge.codelutin.com 12 Sep '17

12 Sep '17

Author: echatellier Date: 2017-09-12 12:33:07 +0200 (Tue, 12 Sep 2017) New Revision: 4422 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4422 Log: fixes #7989: Use java 8 compiler and code compliance Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-09-12 10:28:35 UTC (rev 4421) +++ trunk/pom.xml 2017-09-12 10:33:07 UTC (rev 4422) @@ -554,9 +554,9 @@ <siteDeployClassifier /> <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>Ifremer, Codelutin</license.organizationName> - <maven.compiler.source>1.7</maven.compiler.source> - <maven.compiler.target>1.7</maven.compiler.target> - <signatureArtifactId>java17</signatureArtifactId> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion>  @@ -907,7 +907,7 @@ <properties>  <minimumTokens>100</minimumTokens> - <targetJdk>1.7</targetJdk> + <targetJdk>1.8</targetJdk> </properties> <build> @@ -920,7 +920,7 @@ <artifactId>maven-javadoc-plugin</artifactId> <configuration> <links> - <link>http://docs.oracle.com/javase/7/docs/api/</link> + <link>http://docs.oracle.com/javase/8/docs/api/</link> <link>http://maven-site.nuiton.org/nuiton-utils/nuiton-utils/apidocs/</link> <link>http://maven-site.nuiton.org/nuiton-matrix/nuiton-matrix/apidocs/</link> <link>http://maven-site.nuiton.org/nuiton-j2r/apidocs/</link>

1 0